Moving 1.x branches

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

23 files changed, 0 insertions, 1894 deletions

diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset b/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset
deleted file mode 100644
index 3886f07f2d..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/.ruleset
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<ruleset name="pmd-eclipse">
-  <description>PMD Plugin preferences rule set</description>
-  
-  
-  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
-  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
-  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
-<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
-  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
-<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
-  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
-  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
-<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
-  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
-  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
-  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
-  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
-  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
-<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
-  
-<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
-<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
-<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
-<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
-
-<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
-<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
-<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
-  
-<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
-<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
-
-<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
-<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
-<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
-<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
-<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
-<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
-<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
-<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
-<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
-<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
-<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
-
-<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
-<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
-<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
-
-<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
-<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
-<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
-<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
-<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
-<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
-<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
-<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
-<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
-<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
-<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
-<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
-<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
-<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
-<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
-<rule ref="rulesets/design.xml/IdempotentOperations"/>
-<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
-<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
-<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
-<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
-<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
-<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
-<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
-<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-<rule ref="rulesets/design.xml/SimplifyConditional"/>
-<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
-<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
-<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
-<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
-<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
-<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
-
-<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
-<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
-
-<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
-<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
-<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
-<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
-
-<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
-<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
-
-<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
-<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
-<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
-<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
-<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
-<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
-<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
-<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
-
-  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
-  
-  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
-  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
-  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
-  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
-  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
-  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
-  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
-  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
-  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
-  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
-  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
-  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
-
-  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
-
-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
- 
-  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
-  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
-  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
-  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
-  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
-  
-  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
-  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
-  
-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
-  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
-  
-</ruleset>
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/LICENSE.txt b/branches/pre-spec-changes/runtime/webapp/webapp-api/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/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/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt b/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/pom.xml b/branches/pre-spec-changes/runtime/webapp/webapp-api/pom.xml
deleted file mode 100644
index 639d1beb1f..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-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>
-    <parent>
-        <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
-        <artifactId>webapp</artifactId>
-        <version>0.1-pre-spec-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>webapp-api</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany Web Application Runtime</name>
-    <description>Integration code to run Tuscany in a Web application.</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-host-api</artifactId>
-            <version>${sca.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>test</artifactId>
-            <version>${sca.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
deleted file mode 100644
index 28a4cc2ca3..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.apache.tuscany.runtime.webapp;
-
-/**
- * Constants used by the web application booter
- *
- * @version $Rev$ $Date$
- */
-public final class Constants {
-
-    /**
-     * Name of the parameter that defines the name of webapp resource containing bootstrap jars.
-     */
-    static final String BOOTDIR_PARAM = "tuscany.bootDir";
-
-    /**
-     * Default value for BOOTDIR_PARAM.
-     */
-    static final String BOOTDIR_DEFAULT = "/WEB-INF/tuscany/boot";
-
-    /**
-     * Name of the parameter that defines the class to load to launch the runtime.
-     */
-    static final String RUNTIME_PARAM = "tuscany.runtimeImpl";
-
-    /**
-     * Name of the default webapp runtime implementation.
-     */
-    static final String RUNTIME_DEFAULT = "org.apache.tuscany.runtime.webapp.WebappRuntimeImpl";
-
-    /**
-     * Servlet context-param name for user-specified system SCDL path.
-     */
-    static final String SYSTEM_SCDL_PATH_PARAM = "tuscany.systemScdlPath";
-
-    /**
-     * Default webapp system SCDL path.
-     */
-    static final String SYSTEM_SCDL_PATH_DEFAULT = "META-INF/tuscany/webapp.scdl";
-
-    /**
-     * Servlet context-param name for user-specified application SCDL path.
-     */
-    static final String APPLICATION_SCDL_PATH_PARAM = "tuscany.applicationScdlPath";
-
-    /**
-     * Default application SCDL path.
-     */
-    static final String APPLICATION_SCDL_PATH_DEFAULT = "/WEB-INF/default.scdl";
-
-    /**
-     * Servlet context-param name for setting if the runtime is online.
-     */
-    static final String ONLINE_PARAM = "tuscany.online";
-
-    /**
-     * Context attribute to which the Tuscany runtime for this servlet context is stored.
-     */
-    static final String RUNTIME_ATTRIBUTE = "tuscany.runtime";
-
-    /**
-     * Context attribute for storing the CompositeContext that should be bound to the thread.`
-     */
-    @Deprecated
-    static final String CONTEXT_ATTRIBUTE = "tuscany.context";
-
-    /**
-     * Servlet context-param name for the path to the composite to set as the webb app composite
-     */
-    static final String CURRENT_COMPOSITE_PATH_PARAM = "tuscany.currentCompositePath";
-
-    /**
-     * Servlet context-param name for user-specified system SCDL path.
-     */
-    static final String EXTENSION_SCDL_PATH_PARAM = "tuscany.extensionScdlPath";
-
-    /**
-     * Default path for extensions if no "extensionScdlPath param is specified
-     */
-    static final String DEFAULT_EXTENSION_PATH_PARAM = "/WEB-INF/tuscany/extensions";
-    
-    /**
-     * Servlet context-param name for system monitoring level. Supported values are the names of statics defined in
-     * java.util.logging.Level. If absent, no monitoring will take place.
-     */
-    static final String SYSTEM_MONITORING_PARAM = "tuscany.monitoringLevel";
-
-    private Constants() {
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.java
deleted file mode 100644
index 3d1353de25..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/InvalidResourcePath.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.runtime.webapp;
-
-/**
- * Denotes an invalid or non-existing path for a resource required by the runtime bootstrap
- *
- * @version $Rev$ $Date$
- */
-public class InvalidResourcePath extends TuscanyInitException {
-
-    public InvalidResourcePath(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.java
deleted file mode 100644
index 5936240481..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ServletLauncherMonitor.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.runtime.webapp;
-
-import org.apache.tuscany.api.annotation.LogLevel;
-
-/**
- * A monitor interface used during runtime bootstrap
- *
- * @version $Rev$ $Date$
- */
-public interface ServletLauncherMonitor {
-
-    @LogLevel("DEBUG")
-    void deployExtension(String path);
-
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
deleted file mode 100644
index 15f8133a3d..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.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.runtime.webapp;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.tuscany.api.TuscanyRuntimeException;
-import org.apache.tuscany.host.runtime.ShutdownException;
-import static org.apache.tuscany.runtime.webapp.Constants.ONLINE_PARAM;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-
-/**
- * Launches a Tuscany runtime in a web application, loading information from servlet context parameters. This listener
- * manages one runtime per servlet context; the lifecycle of that runtime corresponds to the the lifecycle of the
- * associated servlet context.
- * <p/>
- * The runtime is launched in a child classloader of the web application, thereby providing isolation between
- * application and system artifacts. Application code only has access to the SCA API and may not reference Tuscany
- * system artifacts directly.
- * <p/>
- * The <code>web.xml</code> of a web application embedding Tuscany must have entries for this listener and {@link
- * TuscanySessionListener}. The latter notifies the runtime of session creation and expiration events through a
- * "bridging" contract, {@link WebappRuntime}. The <code>web.xml</code> may also optionally be configured with entries
- * for {@link TuscanyFilter} and {@link TuscanyServlet}. The former must be mapped to all urls that execute "unmanaged"
- * code which accesses the Tuscany runtime though the SCA API, for example, JSPs and Servlets. The latter forwards
- * service requests into the runtime, by default requests sent to URLs relative to the context path beginning with
- * <code>/services</code>.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyContextListener implements ServletContextListener {
-
-    public void contextInitialized(ServletContextEvent event) {
-        ServletContext servletContext = event.getServletContext();
-        WebappUtil utils = getUtils(servletContext);
-        try {
-            ClassLoader webappClassLoader = Thread.currentThread().getContextClassLoader();
-            ClassLoader bootClassLoader = utils.getBootClassLoader(webappClassLoader);
-            WebappRuntime runtime = utils.getRuntime(bootClassLoader);
-            boolean online = Boolean.valueOf(utils.getInitParameter(ONLINE_PARAM, "true"));
-            WebappRuntimeInfo info = new WebappRuntimeInfoImpl(servletContext,
-                servletContext.getResource("/WEB-INF/tuscany/"),
-                online);
-            URL systemScdl = utils.getSystemScdl(bootClassLoader);
-            URL applicationScdl = utils.getApplicationScdl(webappClassLoader);
-            String name = utils.getApplicationName();
-
-            runtime.setServletContext(servletContext);
-            runtime.setRuntimeInfo(info);
-            runtime.setHostClassLoader(webappClassLoader);
-            runtime.setSystemScdl(systemScdl);
-            runtime.setApplicationName(name);
-            runtime.setApplicationScdl(applicationScdl);
-            runtime.initialize();
-
-            servletContext.setAttribute(RUNTIME_ATTRIBUTE, runtime);
-        } catch (TuscanyRuntimeException e) {
-            servletContext.log(e.getMessage(), e);
-            e.printStackTrace();
-            throw e;
-        } catch (MalformedURLException e) {
-            servletContext.log(e.getMessage(), e);
-            e.printStackTrace();
-            throw new TuscanyInitException(e);
-        } catch (Throwable e) {
-            servletContext.log(e.getMessage(), e);
-            e.printStackTrace();
-            throw new TuscanyInitException(e);
-        }
-    }
-
-    protected WebappUtil getUtils(ServletContext servletContext) {
-        return new WebappUtilImpl(servletContext);
-    }
-
-    public void contextDestroyed(ServletContextEvent event) {
-        ServletContext servletContext = event.getServletContext();
-        WebappRuntime runtime = (WebappRuntime) servletContext.getAttribute(RUNTIME_ATTRIBUTE);
-        if (runtime == null) {
-            return;
-        }
-        servletContext.removeAttribute(RUNTIME_ATTRIBUTE);
-        try {
-            runtime.destroy();
-        } catch (ShutdownException e) {
-            servletContext.log("Error destorying runtume", e);
-        }
-    }
-
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java
deleted file mode 100644
index 58e3895bc7..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.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.runtime.webapp;
-
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletContext;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-import static org.apache.tuscany.runtime.webapp.Constants.CONTEXT_ATTRIBUTE;
-
-/**
- * Maps an incoming request and the current composite context to the composite component for the web application. This
- * filter must be applied to all web application urls that execute unmanaged code (e.g. JSPs and Servlets) which
- * accesses the Tuscany runtime.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyFilter implements Filter {
-    private CompositeContext context;
-    private WebappRuntime runtime;
-
-    public void init(FilterConfig config) throws ServletException {
-        ServletContext servletContext = config.getServletContext();
-        runtime = (WebappRuntime) servletContext.getAttribute(RUNTIME_ATTRIBUTE);
-        if (runtime == null) {
-            throw new ServletException("Tuscany is not configured for the web application");
-        }
-        context = (CompositeContext) servletContext.getAttribute(CONTEXT_ATTRIBUTE);
-        if (context == null) {
-            throw new ServletException("No context specified");
-        }
-    }
-
-    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain filterChain)
-        throws IOException, ServletException {
-        CompositeContext oldContext = CurrentCompositeContext.setContext(context);
-        try {
-            runtime.startRequest();
-            filterChain.doFilter(req, resp);
-        } finally {
-            CurrentCompositeContext.setContext(oldContext);
-            runtime.stopRequest();
-        }
-    }
-
-    public void destroy() {
-        context = null;
-        runtime = null;
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.java
deleted file mode 100644
index a929dd6307..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyInitException.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.runtime.webapp;
-
-import org.apache.tuscany.api.TuscanyRuntimeException;
-
-/**
- * Exception indicating that there was a problem starting the Tuscany runtime.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyInitException extends TuscanyRuntimeException {
-    public TuscanyInitException(String string) {
-        super(string);
-    }
-
-    public TuscanyInitException(String message, String identifier) {
-        super(message, identifier);
-    }
-
-    public TuscanyInitException(String string, Throwable throwable) {
-        super(string, throwable);
-    }
-
-    public TuscanyInitException(String message, String identifier, Throwable cause) {
-        super(message, identifier, cause);
-    }
-
-    public TuscanyInitException(Throwable throwable) {
-        super(throwable);
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.java
deleted file mode 100644
index 325532aef6..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyRequestListener.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.runtime.webapp;

-

-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;

-

-import javax.servlet.ServletContext;

-import javax.servlet.ServletException;

-import javax.servlet.ServletRequest;

-import javax.servlet.ServletRequestEvent;

-import javax.servlet.ServletRequestListener;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpSession;

-

-/**

- * Notifies the Tuscany runtime of session creation and expiration events.

- * 

- * @version $Rev: 441961 $ $Date: 2006-09-10 11:48:29 -0400 (Sun, 10 Sep 2006) $

- */

-public class TuscanyRequestListener implements ServletRequestListener {

-    private WebappRuntime runtime;

-

-    public void requestDestroyed(ServletRequestEvent servletRequestEvent) {

-

-        final ServletContext context = servletRequestEvent.getServletContext();

-        getRuntime(context);

-        ServletRequest servletRequest = servletRequestEvent.getServletRequest();

-        if (servletRequest instanceof HttpServletRequest) {

-            HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;

-            HttpSession session = httpServletRequest.getSession(false);

-            runtime.httpRequestEnded(session == null ? null : session.getId());

-

-        }

-

-    }

-

-    public void requestInitialized(ServletRequestEvent servletRequestEvent) {

-

-        final ServletContext context = servletRequestEvent.getServletContext();

-        getRuntime(context);

-        ServletRequest servletRequest = servletRequestEvent.getServletRequest();

-        if (servletRequest instanceof HttpServletRequest) {

-            runtime.httpRequestStarted((HttpServletRequest) servletRequest);

-

-        }

-

-    }

-

-    protected WebappRuntime getRuntime(final ServletContext context) {

-        if (runtime == null) {

-

-            runtime = (WebappRuntime) context.getAttribute(RUNTIME_ATTRIBUTE);

-            if (runtime == null) {

-                context.log("requestInitialized", new ServletException("Tuscany runtime not configured"));

-                return null;

-            }

-        }

-        return runtime;

-    }

-}
\ No newline at end of file
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.java
deleted file mode 100644
index 3132559fdd..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyServlet.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.runtime.webapp;
-
-import java.io.IOException;
-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 org.apache.tuscany.host.servlet.ServletRequestInjector;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-
-/**
- * A servlet that forwards requests intended for SCA services into the Tuscany runtime via a ServletRequestInjector.
- * This servlet is typically mapped to relative paths beginning with <code>/services</code> in the <code>web.xml</code>
- * <p/>
- * TODO a better URL mapping scheme out to be implemented that corresponds to the SCA specification
- */
-public class TuscanyServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    private ServletRequestInjector requestInjector;
-
-    @Override
-    public void init(ServletConfig config) throws ServletException {
-        ServletContext servletContext = config.getServletContext();
-        WebappRuntime runtime = (WebappRuntime) servletContext.getAttribute(RUNTIME_ATTRIBUTE);
-        if (runtime == null) {
-            throw new ServletException("Tuscany runtime not configured for web application");
-        }
-        requestInjector = runtime.getRequestInjector();
-    }
-
-    @Override
-    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
-        requestInjector.service(req, res);
-    }
-
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.java
deleted file mode 100644
index 0335c7bc6a..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanySessionListener.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.runtime.webapp;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-
-/**
- * Notifies the Tuscany runtime of session creation and expiration events.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanySessionListener implements HttpSessionListener {
-    private WebappRuntime runtime;
-
-    public void sessionCreated(HttpSessionEvent event) {
-        if (runtime == null) {
-            ServletContext context = event.getSession().getServletContext();
-            runtime = (WebappRuntime) context.getAttribute(RUNTIME_ATTRIBUTE);
-            if (runtime == null) {
-                context.log("Error on session creation", new ServletException("Tuscany runtime not configured"));
-                return;
-            }
-        }
-        runtime.sessionCreated(event);
-    }
-
-    public void sessionDestroyed(HttpSessionEvent event) {
-        if (runtime != null) {
-            runtime.sessionDestroyed(event);
-        }
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.java
deleted file mode 100644
index 48b4ee8292..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntime.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.runtime.webapp;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSessionListener;
-
-import org.apache.tuscany.host.runtime.TuscanyRuntime;
-import org.apache.tuscany.host.servlet.ServletRequestInjector;
-
-/**
- * The contract for artifacts loaded in the web application classloader to comminicate with the Tuscany runtime loaded
- * in a child classloader. For example, filters and listeners may use this interface to notify the runtime of the web
- * container events.
- *
- * @version $Rev$ $Date$
- * @see TuscanyFilter
- * @see TuscanySessionListener
- */
-public interface WebappRuntime extends HttpSessionListener, TuscanyRuntime {
-    /**
-     * Returns the ServletContext associated with this runtime.
-     *
-     * @return the ServletContext associated with this runtime
-     */
-    ServletContext getServletContext();
-
-    /**
-     * Sets the ServletContext associated with this runtime.
-     *
-     * @param servletContext the ServletContext associated with this runtime
-     */
-    void setServletContext(ServletContext servletContext);
-
-    /**
-     * Returns the request injector for the runtime
-     */
-    ServletRequestInjector getRequestInjector();
-
-    /**
-     * Notification that the web application has begun servicing a request
-     */
-    void startRequest();
-
-    /**
-     * Notification that the web application has stopped servicing a request
-     */
-    void stopRequest();
-
-    /**
-     * Request has been started for the given request
-     */
-    void httpRequestStarted(HttpServletRequest request);
-
-    /**
-     * Request has been ended with the given session id
-     */
-    void httpRequestEnded(Object id);
-    
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
deleted file mode 100644
index d08ae10e07..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.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.runtime.webapp;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tuscany.host.RuntimeInfo;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface WebappRuntimeInfo extends RuntimeInfo {
-    String COMPONENT_NAME = "WebappRuntimeInfo";
-    /**
-     * Returns the ServletContext associated with this webapp runtime.
-     *
-     * @return the ServletContext associated with this webapp runtime.
-     */
-    ServletContext getServletContext();
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java
deleted file mode 100644
index 1f08fa2790..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.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.runtime.webapp;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URI;
-import javax.servlet.ServletContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WebappRuntimeInfoImpl implements WebappRuntimeInfo {
-    private final ServletContext servletContext;
-    private final URL baseURL;
-    private final boolean online;
-
-    public WebappRuntimeInfoImpl(ServletContext servletContext, URL baseURL, boolean online) {
-        this.servletContext = servletContext;
-        this.baseURL = baseURL;
-        this.online = online;
-    }
-
-    public ServletContext getServletContext() {
-        return servletContext;
-    }
-
-    public URL getBaseURL() {
-        return baseURL;
-    }
-
-    public File getInstallDirectory() {
-        return new File("");
-    }
-
-    public File getApplicationRootDirectory() {
-        return new File("");
-    }
-
-    public boolean isOnline() {
-        return online;
-    }
-
-    public URI getDomain() {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getRuntimeId() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.java
deleted file mode 100644
index 263436bd96..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtil.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.runtime.webapp;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface WebappUtil {
-
-    String getApplicationName();
-
-    WebappRuntime getRuntime(ClassLoader bootClassLoader) throws TuscanyInitException;
-
-    /**
-     * Return the classloader that should be used to boot the Tuscany runtime. This will be a child of the web
-     * application's ClassLoader.
-     *
-     * @param webappClassLoader the web application's classloader
-     * @return a classloader that can be used to load the Tuscany runtime classes
-     */
-    ClassLoader getBootClassLoader(ClassLoader webappClassLoader) throws InvalidResourcePath;
-
-    URL getSystemScdl(ClassLoader bootClassLoader) throws InvalidResourcePath;
-
-    URL getApplicationScdl(ClassLoader bootClassLoader) throws InvalidResourcePath;
-
-    URL getScdlURL(String path, ClassLoader classLoader) throws MalformedURLException;
-
-    /**
-     * Return a init parameter from the servlet context or provide a default.
-     *
-     * @param name  the name of the parameter
-     * @param value the default value
-     * @return the value of the specified parameter, or the default if not defined
-     */
-    String getInitParameter(String name, String value);
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.java
deleted file mode 100644
index fcaec7f8ac..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappUtilImpl.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.runtime.webapp;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Set;
-import javax.servlet.ServletContext;
-
-import static org.apache.tuscany.runtime.webapp.Constants.APPLICATION_SCDL_PATH_DEFAULT;
-import static org.apache.tuscany.runtime.webapp.Constants.APPLICATION_SCDL_PATH_PARAM;
-import static org.apache.tuscany.runtime.webapp.Constants.BOOTDIR_DEFAULT;
-import static org.apache.tuscany.runtime.webapp.Constants.BOOTDIR_PARAM;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_DEFAULT;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_PARAM;
-import static org.apache.tuscany.runtime.webapp.Constants.SYSTEM_SCDL_PATH_DEFAULT;
-import static org.apache.tuscany.runtime.webapp.Constants.SYSTEM_SCDL_PATH_PARAM;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WebappUtilImpl implements WebappUtil {
-    private final ServletContext servletContext;
-
-    public WebappUtilImpl(ServletContext servletContext) {
-        this.servletContext = servletContext;
-    }
-
-    public WebappRuntime getRuntime(ClassLoader bootClassLoader) throws TuscanyInitException {
-        try {
-            String className = getInitParameter(RUNTIME_PARAM, RUNTIME_DEFAULT);
-            return (WebappRuntime) bootClassLoader.loadClass(className).newInstance();
-        } catch (InstantiationException e) {
-            throw new TuscanyInitException(e);
-        } catch (IllegalAccessException e) {
-            throw new TuscanyInitException(e);
-        } catch (ClassNotFoundException e) {
-            throw new TuscanyInitException("Runtime Implementation not found", e);
-        }
-    }
-
-    public ClassLoader getBootClassLoader(ClassLoader webappClassLoader) throws InvalidResourcePath {
-        String bootDirName = getInitParameter(BOOTDIR_PARAM, BOOTDIR_DEFAULT);
-        Set paths = servletContext.getResourcePaths(bootDirName);
-        if (paths == null) {
-            // nothing in boot directory, assume everything is in the webapp classloader
-            return webappClassLoader;
-        }
-        URL[] urls = new URL[paths.size()];
-        int i = 0;
-        for (Object path : paths) {
-            try {
-                urls[i++] = servletContext.getResource((String) path);
-            } catch (MalformedURLException e) {
-                throw new InvalidResourcePath(APPLICATION_SCDL_PATH_PARAM, path.toString(),  e);
-            }
-        }
-        return new URLClassLoader(urls, webappClassLoader);
-    }
-
-    public URL getSystemScdl(ClassLoader bootClassLoader) throws InvalidResourcePath {
-        String path = getInitParameter(SYSTEM_SCDL_PATH_PARAM, SYSTEM_SCDL_PATH_DEFAULT);
-        try {
-            return getScdlURL(path, bootClassLoader);
-        } catch (MalformedURLException e) {
-            throw new InvalidResourcePath(SYSTEM_SCDL_PATH_PARAM, path, e);
-        }
-    }
-
-    public String getApplicationName() {
-        String name = servletContext.getServletContextName();
-        if (name == null) {
-            name = "application";
-        }
-        return name;
-    }
-
-    public URL getApplicationScdl(ClassLoader bootClassLoader) throws InvalidResourcePath {
-        String path = getInitParameter(APPLICATION_SCDL_PATH_PARAM, APPLICATION_SCDL_PATH_DEFAULT);
-        try {
-            return getScdlURL(path, bootClassLoader);
-        } catch (MalformedURLException e) {
-            throw new InvalidResourcePath(APPLICATION_SCDL_PATH_PARAM, path, e);
-        }
-    }
-
-    public URL getScdlURL(String path, ClassLoader classLoader) throws MalformedURLException {
-        URL ret = null;
-        if (path.charAt(0) == '/') {
-            // user supplied an absolute path - look up as a webapp resource
-            ret = servletContext.getResource(path);
-        }
-        if (ret == null) {
-            // user supplied a relative path - look up as a boot classpath resource
-            ret = classLoader.getResource(path);
-        }
-        return ret;
-    }
-
-    public String getInitParameter(String name, String value) {
-        String result = servletContext.getInitParameter(name);
-        if (result != null && result.length() != 0) {
-            return result;
-        }
-        return value;
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
deleted file mode 100644
index c4c5f842b2..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.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.runtime.webapp;
-
-import java.net.URL;
-import java.lang.reflect.Method;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-
-import junit.framework.TestCase;
-import static org.easymock.classextension.EasyMock.*;
-
-import org.apache.tuscany.host.MonitorFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TuscanyContextListenerTestCase extends TestCase {
-    private ServletContext context;
-    private TuscanyContextListener listener;
-    private ClassLoader cl;
-    private ClassLoader bootClassLoader;
-    private URL systemUrl;
-    private URL applicationUrl;
-    private Method getUtilsMethod;
-    private MonitorFactory monitorFactory;
-    private WebappUtil utils;
-
-    public void testInitializationUsingDefaults() throws Exception {
-        ServletContextEvent event = createMock(ServletContextEvent.class);
-        expect(event.getServletContext()).andReturn(context);
-        replay(event);
-
-        WebappRuntime runtime = createMock(WebappRuntime.class);
-        expect(utils.getBootClassLoader(cl)).andReturn(bootClassLoader);
-        expect(utils.getInitParameter("tuscany.online", "true")).andReturn("true");
-        expect(utils.getRuntime(bootClassLoader)).andReturn(runtime);
-        expect(utils.getSystemScdl(bootClassLoader)).andReturn(systemUrl);
-        expect(utils.getApplicationScdl(cl)).andReturn(applicationUrl);
-        expect(utils.getApplicationName()).andReturn("application");
-        replay(utils);
-
-        expect(context.getResource("/WEB-INF/tuscany/")).andReturn(null);
-        context.setAttribute(eq(Constants.RUNTIME_ATTRIBUTE), isA(WebappRuntime.class));
-        replay(context);
-        replay(cl);
-        replay(bootClassLoader);
-        expect(listener.getUtils(context)).andReturn(utils);
-        replay(listener);
-        runtime.setServletContext(context);
-        runtime.setRuntimeInfo(isA(WebappRuntimeInfo.class));
-        runtime.setHostClassLoader(cl);
-        runtime.setSystemScdl(systemUrl);
-        runtime.setApplicationName("application");
-        runtime.setApplicationScdl(applicationUrl);
-        runtime.initialize();
-        replay(runtime);
-
-        ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
-        try {
-            Thread.currentThread().setContextClassLoader(cl);
-            listener.contextInitialized(event);
-        } finally {
-            Thread.currentThread().setContextClassLoader(oldCl);
-        }
-        verify(event);
-        verify(context);
-        verify(listener);
-        verify(cl);
-        verify(bootClassLoader);
-        verify(runtime);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        getUtilsMethod = TuscanyContextListener.class.getDeclaredMethod("getUtils", ServletContext.class);
-        utils = createMock(WebappUtil.class);
-        listener = createMock(TuscanyContextListener.class, new Method[]{getUtilsMethod});
-        context = createMock(ServletContext.class);
-        cl = createMock(ClassLoader.class);
-        bootClassLoader = createMock(ClassLoader.class);
-        systemUrl = new URL("file:/system.scdl");
-        applicationUrl = new URL("file:/application.scdl");
-        monitorFactory = createMock(MonitorFactory.class);
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java
deleted file mode 100644
index 80cfd3513a..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.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.runtime.webapp;
-
-import java.io.IOException;
-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 junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.osoa.sca.CompositeContext;
-
-import static org.apache.tuscany.runtime.webapp.Constants.CONTEXT_ATTRIBUTE;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TuscanyFilterTestCase extends TestCase {
-    private TuscanyFilter filter;
-    private FilterConfig config;
-    private ServletContext servletContext;
-    private WebappRuntime runtime;
-    private CompositeContext context;
-    private ServletRequest request;
-    private ServletResponse response;
-    private FilterChain chain;
-
-    public void testFilterInit() {
-        EasyMock.expect(config.getServletContext()).andReturn(servletContext);
-        EasyMock.expect(servletContext.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(runtime);
-        EasyMock.expect(servletContext.getAttribute(CONTEXT_ATTRIBUTE)).andReturn(context);
-
-        EasyMock.replay(servletContext);
-        EasyMock.replay(config);
-        EasyMock.replay(runtime);
-        EasyMock.replay(context);
-        try {
-            filter.init(config);
-        } catch (ServletException e) {
-            fail(e.getMessage());
-        }
-        EasyMock.verify(servletContext);
-        EasyMock.verify(config);
-        EasyMock.verify(runtime);
-        EasyMock.verify(context);
-    }
-
-    public void testFilterInitWithNoRuntimeConfigured() {
-        EasyMock.expect(config.getServletContext()).andReturn(servletContext);
-        EasyMock.expect(servletContext.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(null);
-
-        EasyMock.replay(servletContext);
-        EasyMock.replay(config);
-        EasyMock.replay(runtime);
-        EasyMock.replay(context);
-        try {
-            filter.init(config);
-            fail("Expected a ServletException");
-        } catch (ServletException e) {
-            // OK
-        }
-        EasyMock.verify(servletContext);
-        EasyMock.verify(config);
-        EasyMock.verify(runtime);
-        EasyMock.verify(context);
-    }
-
-    public void testContextIsAssociatedWithThread() throws ServletException, IOException {
-        EasyMock.expect(config.getServletContext()).andReturn(servletContext);
-        EasyMock.expect(servletContext.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(runtime);
-        EasyMock.expect(servletContext.getAttribute(CONTEXT_ATTRIBUTE)).andReturn(context);
-        EasyMock.replay(servletContext);
-        EasyMock.replay(config);
-        filter.init(config);
-
-        chain.doFilter(EasyMock.same(request), EasyMock.same(response));
-        EasyMock.replay(chain);
-        runtime.startRequest();
-        runtime.stopRequest();
-        EasyMock.replay(runtime);
-        try {
-            filter.doFilter(request, response, chain);
-        } catch (IOException e) {
-            fail(e.getMessage());
-        }
-        EasyMock.verify(chain);
-        EasyMock.verify(runtime);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        filter = new TuscanyFilter();
-        config = EasyMock.createMock(FilterConfig.class);
-        servletContext = EasyMock.createMock(ServletContext.class);
-        runtime = EasyMock.createMock(WebappRuntime.class);
-        context = EasyMock.createMock(CompositeContext.class);
-        request = EasyMock.createMock(ServletRequest.class);
-        response = EasyMock.createMock(ServletResponse.class);
-        chain = EasyMock.createMock(FilterChain.class);
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.java
deleted file mode 100644
index 5213ae9cb1..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyServletTestCase.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.runtime.webapp;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.host.servlet.ServletRequestInjector;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-import org.easymock.EasyMock;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-/**
- * Verifies {@link TuscanyServlet} properly services a request
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyServletTestCase extends TestCase {
-
-    public void testRequestInjection() throws Exception {
-        ServletRequest req = createNiceMock(ServletRequest.class);
-        ServletResponse resp = createNiceMock(ServletResponse.class);
-        ServletRequestInjector injector = createMock(ServletRequestInjector.class);
-        injector.service(eq(req), eq(resp));
-        EasyMock.replay(injector);
-        WebappRuntime runtime = createMock(WebappRuntime.class);
-        expect(runtime.getRequestInjector()).andReturn(injector);
-        replay(runtime);
-        ServletContext context = createNiceMock(ServletContext.class);
-        EasyMock.expect(context.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(runtime);
-        EasyMock.replay(context);
-        TuscanyServlet servlet = new TuscanyServlet();
-        ServletConfig config = createMock(ServletConfig.class);
-        expect(config.getServletContext()).andReturn(context);
-        replay(config);
-        servlet.init(config);
-        servlet.service(req, resp);
-        verify(context);
-        verify(injector);
-    }
-
-    public void testRuntimeNotConfigured() throws Exception {
-        ServletContext context = createNiceMock(ServletContext.class);
-        TuscanyServlet servlet = new TuscanyServlet();
-        ServletConfig config = createMock(ServletConfig.class);
-        expect(config.getServletContext()).andReturn(context);
-        replay(config);
-        try {
-            servlet.init(config);
-            fail();
-        } catch (ServletException e) {
-            //expected
-        }
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java
deleted file mode 100644
index 156ff35b68..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanySessionListenerTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.tuscany.runtime.webapp;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-
-import junit.framework.TestCase;
-import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-import org.easymock.EasyMock;
-
-/**
- * Verifies {@link org.apache.tuscany.runtime.webapp.TuscanySessionListener} notifies the runtime of session events
- *
- * @version $Rev$ $Date$
- */
-public class TuscanySessionListenerTestCase extends TestCase {
-
-    public void testSessionPropagated() throws Exception {
-        WebappRuntime runtime = EasyMock.createNiceMock(WebappRuntime.class);
-        runtime.sessionCreated(EasyMock.isA(HttpSessionEvent.class));
-        runtime.sessionDestroyed(EasyMock.isA(HttpSessionEvent.class));
-        EasyMock.replay(runtime);
-        ServletContext context = EasyMock.createNiceMock(ServletContext.class);
-        EasyMock.expect(context.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(runtime);
-        EasyMock.replay(context);
-        HttpSession session = EasyMock.createNiceMock(HttpSession.class);
-        EasyMock.expect(session.getServletContext()).andReturn(context);
-        EasyMock.replay(session);
-        HttpSessionEvent event = new HttpSessionEvent(session);
-        TuscanySessionListener listener = new TuscanySessionListener();
-        listener.sessionCreated(event);
-        listener.sessionDestroyed(event);
-        EasyMock.verify(context);
-        EasyMock.verify(runtime);
-    }
-
-    /**
-     * Verifies an error is logged when no runtime is configured
-     *
-     * @throws Exception
-     */
-    public void testRuntimeNotConfigured() throws Exception {
-        ServletContext context = EasyMock.createNiceMock(ServletContext.class);
-        context.log(EasyMock.isA(String.class), EasyMock.isA(ServletException.class));
-        EasyMock.replay(context);
-        TuscanySessionListener listener = new TuscanySessionListener();
-        HttpSession session = EasyMock.createNiceMock(HttpSession.class);
-        EasyMock.expect(session.getServletContext()).andReturn(context);
-        EasyMock.replay(session);
-        HttpSessionEvent event = new HttpSessionEvent(session);
-        listener.sessionCreated(event);
-        EasyMock.verify(context);
-    }
-
-    public void testSessionDestroyedBeforeCreated() throws Exception {
-        TuscanySessionListener listener = new TuscanySessionListener();
-        listener.sessionDestroyed(null);
-    }
-}
diff --git a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.java b/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.java
deleted file mode 100644
index f865a4e740..0000000000
--- a/branches/pre-spec-changes/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/WebappUtilTestCase.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.runtime.webapp;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.servlet.ServletContext;
-
-import junit.framework.TestCase;
-import static org.easymock.classextension.EasyMock.*;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WebappUtilTestCase extends TestCase {
-    private ServletContext context;
-    private WebappUtilImpl listener;
-    private ClassLoader cl;
-    private URL systemUrl;
-
-
-    public void testGetInitParameterWhenSpecified() {
-        String name = "name";
-        String value = "default";
-        expect(context.getInitParameter(name)).andReturn(value);
-        replay(context);
-
-        assertEquals(value, listener.getInitParameter(name, "default"));
-        verify(context);
-    }
-
-    public void testGetInitParameterUsingDefault() {
-        String name = "name";
-        String value = "default";
-        expect(context.getInitParameter(name)).andReturn(null);
-        replay(context);
-
-        assertEquals(value, listener.getInitParameter(name, value));
-        verify(context);
-    }
-
-    public void testGetInitParameterWithZeroLength() {
-        String name = "name";
-        String value = "default";
-        expect(context.getInitParameter(name)).andReturn("");
-        replay(context);
-
-        assertEquals(value, listener.getInitParameter(name, value));
-        verify(context);
-    }
-
-    public void testGetScdlFromWebapp() throws MalformedURLException {
-        String path = "/WEB-INF/test";
-        expect(context.getResource(path)).andReturn(systemUrl);
-        replay(context);
-        replay(cl);
-        assertSame(systemUrl, listener.getScdlURL(path, cl));
-        verify(context);
-        verify(cl);
-    }
-
-    public void testGetScdlFromWebappMissing() throws MalformedURLException {
-        String path = "/WEB-INF/test";
-        expect(context.getResource(path)).andReturn(null);
-        replay(context);
-        expect(cl.getResource(path)).andReturn(null);
-        replay(cl);
-        assertNull(listener.getScdlURL(path, cl));
-        verify(context);
-        verify(cl);
-    }
-
-    public void testGetScdlFromWebappMalformed() throws MalformedURLException {
-        String path = "/WEB-INF/test";
-        expect(context.getResource(path)).andThrow(new MalformedURLException());
-        replay(context);
-        replay(cl);
-        try {
-            listener.getScdlURL(path, cl);
-            fail();
-        } catch (MalformedURLException e) {
-            // OK
-        }
-        verify(context);
-        verify(cl);
-    }
-
-    public void testGetScdlFromClasspath() throws MalformedURLException {
-        String path = "META-INF/test";
-        replay(context);
-        expect(cl.getResource(path)).andReturn(systemUrl);
-        replay(cl);
-        assertSame(systemUrl, listener.getScdlURL(path, cl));
-        verify(context);
-        verify(cl);
-    }
-
-    public void testGetScdlFromClasspathMissing() throws MalformedURLException {
-        String path = "META-INF/test";
-        replay(context);
-        expect(cl.getResource(path)).andReturn(null);
-        replay(cl);
-        assertNull(listener.getScdlURL(path, cl));
-        verify(context);
-        verify(cl);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        context = createMock(ServletContext.class);
-        listener = new WebappUtilImpl(context);
-        cl = createMock(ClassLoader.class);
-        systemUrl = new URL("file:/system.scdl");
-    }
-}