Moving 1.x branches

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

9 files changed, 0 insertions, 1147 deletions

diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/.ruleset b/branches/sca-java-M2/sca/services/transports/http.jetty/.ruleset
deleted file mode 100644
index 3886f07f2d..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/.ruleset
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<ruleset name="pmd-eclipse">
-  <description>PMD Plugin preferences rule set</description>
-  
-  
-  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
-  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
-  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
-<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
-  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
-<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
-<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
-  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
-  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
-<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
-  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
-  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
-  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
-  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
-  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
-<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
-  
-<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
-<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
-<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
-<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
-
-<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
-<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
-<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
-  
-<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
-<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
-<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
-
-<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
-<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
-<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
-<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
-<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
-<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
-<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
-<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
-<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
-<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
-<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
-
-<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
-<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
-<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
-
-<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
-<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
-<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
-<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
-<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
-<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
-<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
-<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
-<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
-<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
-<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
-<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
-<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
-<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
-<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
-<rule ref="rulesets/design.xml/IdempotentOperations"/>
-<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
-<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
-<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
-<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
-<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
-<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
-<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
-<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-<rule ref="rulesets/design.xml/SimplifyConditional"/>
-<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
-<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
-<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
-<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
-<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
-<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
-
-<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
-<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
-<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
-
-<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
-<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
-<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
-<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
-
-<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
-<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
-
-<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
-<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
-<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
-<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
-<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
-<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
-<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
-<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
-
-  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
-  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
-  
-  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
-  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
-  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
-  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
-  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
-  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
-  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
-  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
-  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
-  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
-  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
-  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
-  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
-
-  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
-  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
-
-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
- 
-  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
-  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
-  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
-  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
-  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
-  
-  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
-  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
-  
-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
-  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
-  
-</ruleset>
diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/LICENSE.txt b/branches/sca-java-M2/sca/services/transports/http.jetty/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/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, 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/branches/sca-java-M2/sca/services/transports/http.jetty/NOTICE.txt b/branches/sca-java-M2/sca/services/transports/http.jetty/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/pom.xml b/branches/sca-java-M2/sca/services/transports/http.jetty/pom.xml
deleted file mode 100644
index 3fd0189fba..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/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>
-    <parent>
-        <groupId>org.apache.tuscany.services</groupId>
-        <artifactId>services</artifactId>
-        <version>1.0-incubator-M2-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>http-jetty</artifactId>
-    <name>Apache Tuscany Jetty HTTP Service</name>
-    <description>Tuscany Jetty HTTP Service</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-spi</artifactId>
-            <version>${sca.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.0.0beta17</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>6.0.0beta16</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyLogger.java b/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyLogger.java
deleted file mode 100644
index d42b301fbb..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyLogger.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.service.jetty;
-
-import org.mortbay.log.Logger;
-
-/**
- * Serves as a wrapper for a {@link TransportMonitor} to replace Jetty's logging mechanism
- *
- * @version $Rev$ $Date$
- */
-public class JettyLogger implements Logger {
-
-    private TransportMonitor monitor;
-    private boolean debugEnabled;
-
-    public void setMonitor(TransportMonitor monitor) {
-        this.monitor = monitor;
-    }
-
-    public boolean isDebugEnabled() {
-        return debugEnabled;
-    }
-
-    public void setDebugEnabled(boolean debugEnabled) {
-        this.debugEnabled = debugEnabled;
-    }
-
-    public void info(String msg, Object arg0, Object arg1) {
-        if (monitor != null) {
-            monitor.debug(msg, arg0, arg1);
-        } else if (debugEnabled) {
-            System.err.println(":INFO:  " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void debug(String msg, Throwable th) {
-        if (debugEnabled) {
-            if (monitor != null) {
-                monitor.debug(msg, th);
-            } else {
-                System.err.println(":DEBUG:  " + msg);
-                th.printStackTrace();
-            }
-        }
-    }
-
-    public void debug(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            if (monitor != null) {
-                monitor.debug(msg, arg0, arg1);
-            } else {
-                System.err.println(":DEBUG: " + format(msg, arg0, arg1));
-            }
-        }
-    }
-
-    public void warn(String msg, Object arg0, Object arg1) {
-        if (monitor != null) {
-            monitor.warn(msg, arg0, arg1);
-        } else if (debugEnabled) {
-            System.err.println(":WARN: " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void warn(String msg, Throwable th) {
-        if (monitor != null) {
-            monitor.warn(msg, th);
-        } else 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/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyService.java b/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyService.java
deleted file mode 100644
index 6fd68813df..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyService.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.service.jetty;
-
-import org.apache.tuscany.spi.host.ServletHost;
-
-import org.mortbay.jetty.Server;
-
-/**
- * Implementations provide a Jetty transport service to the runtime
- *
- * @version $$Rev$$ $$Date$$
- */
-public interface JettyService extends ServletHost {
-
-    /**
-     * Returns the active Jetty server
-     */
-    Server getServer();
-
-
-}
diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java b/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java
deleted file mode 100644
index 01ad06fbe9..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.service.jetty;
-
-import java.io.File;
-import java.io.IOException;
-import javax.resource.spi.work.Work;
-import javax.servlet.Servlet;
-
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.api.annotation.Monitor;
-import org.apache.tuscany.spi.host.ServletHost;
-import org.apache.tuscany.spi.services.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.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.ServletMapping;
-import org.mortbay.log.Log;
-import org.mortbay.log.Logger;
-import org.mortbay.thread.BoundedThreadPool;
-import org.mortbay.thread.ThreadPool;
-
-/**
- * Implements an HTTP transport service using Jetty.
- *
- * @version $$Rev$$ $$Date$$
- */
-@Scope("MODULE")
-@Service(ServletHost.class)
-public class JettyServiceImpl implements JettyService {
-
-    private static final String ROOT = "/";
-    private static final int ERROR = 0;
-    private static final int UNINITIALIZED = 0;
-    private static final int STARTING = 1;
-    private static final int STARTED = 2;
-    private static final int STOPPING = 3;
-    private static final int STOPPED = 4;
-
-    private final Object joinLock = new Object();
-    private int state = UNINITIALIZED;
-    private int httpPort = 8080;
-    private int httpsPort = 8484;
-    private String keystore;
-    private String certPassword;
-    private String keyPassword;
-    private boolean sendServerVersion;
-    private boolean https;
-    private TransportMonitor monitor;
-    private WorkScheduler scheduler;
-    private boolean debug;
-    private Server server;
-    private Connector connector;
-    private ServletHandler servletHandler;
-
-    static {
-        // hack to replace the static Jetty logger
-        System.setProperty("org.mortbay.log.class", JettyLogger.class.getName());
-    }
-
-    public JettyServiceImpl(@Monitor TransportMonitor monitor,
-                            @Autowire WorkScheduler scheduler) {
-        this.monitor = monitor;
-        this.scheduler = scheduler;
-        // Jetty uses a static logger, so jam in the monitor into a static reference
-        Logger logger = Log.getLogger(null);
-        if (logger instanceof JettyLogger) {
-            JettyLogger jettyLogger = (JettyLogger) logger;
-            jettyLogger.setMonitor(monitor);
-            if (debug) {
-                jettyLogger.setDebugEnabled(true);
-            }
-        }
-    }
-
-    public JettyServiceImpl(TransportMonitor monitor) {
-        this.monitor = monitor;
-    }
-
-    public JettyServiceImpl(TransportMonitor monitor,
-                            WorkScheduler scheduler,
-                            Connector connector) {
-        this(monitor, scheduler);
-        this.connector = connector;
-    }
-
-    @Property
-    public void setHttpPort(int httpPort) {
-        this.httpPort = httpPort;
-    }
-
-    @Property
-    public void setHttpsPort(int httpsPort) {
-        this.httpsPort = httpsPort;
-    }
-
-    @Property
-    public void setSendServerVersion(boolean sendServerVersion) {
-        this.sendServerVersion = sendServerVersion;
-    }
-
-    @Property
-    public void setHttps(boolean https) {
-        this.https = https;
-    }
-
-    @Property
-    public void setKeystore(String keystore) {
-        this.keystore = keystore;
-    }
-
-    @Property
-    public void setCertPassword(String certPassword) {
-        this.certPassword = certPassword;
-    }
-
-    @Property
-    public void setKeyPassword(String keyPassword) {
-        this.keyPassword = keyPassword;
-    }
-
-    @Property
-    public void setDebug(boolean val) {
-        debug = val;
-    }
-
-    @Init
-    public void init() throws Exception {
-        try {
-            state = STARTING;
-            server = new Server();
-            if (scheduler == null) {
-                BoundedThreadPool threadPool = new BoundedThreadPool();
-                threadPool.setMaxThreads(100);
-                server.setThreadPool(threadPool);
-            } else {
-                server.setThreadPool(new TuscanyThreadPool());
-            }
-            if (connector == null) {
-                if (https) {
-                    Connector httpConnector = new SelectChannelConnector();
-                    httpConnector.setPort(httpPort);
-                    SslSocketConnector sslConnector = new SslSocketConnector();
-                    sslConnector.setPort(httpsPort);
-                    sslConnector.setKeystore(keystore);
-                    sslConnector.setPassword(certPassword);
-                    sslConnector.setKeyPassword(keyPassword);
-                    server.setConnectors(new Connector[]{httpConnector, sslConnector});
-                } else {
-                    SelectChannelConnector selectConnector = new SelectChannelConnector();
-                    selectConnector.setPort(httpPort);
-                    server.setConnectors(new Connector[]{selectConnector});
-                }
-            } else {
-                connector.setPort(httpPort);
-                server.setConnectors(new Connector[]{connector});
-            }
-            ContextHandler contextHandler = new ContextHandler();
-            contextHandler.setContextPath(ROOT);
-            server.setHandler(contextHandler);
-            servletHandler = new ServletHandler();
-            contextHandler.setHandler(servletHandler);
-            server.setStopAtShutdown(true);
-            server.setSendServerVersion(sendServerVersion);
-            monitor.started();
-            server.start();
-            state = STARTED;
-        } catch (Exception e) {
-            state = ERROR;
-            throw e;
-        }
-    }
-
-    @Destroy
-    public void destroy() throws Exception {
-        state = STOPPING;
-        synchronized (joinLock) {
-            joinLock.notifyAll();
-        }
-        server.stop();
-        state = STOPPED;
-        monitor.shutdown();
-    }
-
-    public void registerMapping(String path, Servlet servlet) {
-        ServletHolder holder = new ServletHolder(servlet);
-        servletHandler.addServlet(holder);
-        ServletMapping mapping = new ServletMapping();
-        mapping.setServletName(holder.getClassName());
-        mapping.setPathSpec(path);
-        servletHandler.addServletMapping(mapping);
-    }
-
-    public void unregisterMapping(String string) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void registerComposite(File compositeLocation) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    public Server getServer() {
-        return server;
-    }
-
-    public int getHttpPort() {
-        return httpPort;
-    }
-
-    /**
-     * An integration wrapper to enable use of a {@link WorkScheduler} with Jetty
-     */
-    private class TuscanyThreadPool implements ThreadPool {
-
-        public boolean dispatch(Runnable job) {
-            scheduler.scheduleWork(new TuscanyWork(job));
-            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() {
-            // TODO FIXME
-            return false;
-        }
-
-        public void start() throws Exception {
-
-        }
-
-        public void stop() throws Exception {
-
-        }
-
-        public boolean isRunning() {
-            return state == STARTING || state == STARTED;
-        }
-
-        public boolean isStarted() {
-            return state == STARTED;
-        }
-
-        public boolean isStarting() {
-            return state == STARTING;
-        }
-
-        public boolean isStopping() {
-            return state == STOPPING;
-        }
-
-        public boolean isFailed() {
-            return state == ERROR;
-        }
-    }
-
-    /**
-     * A unit of work dispatched to the runtime work scheduler
-     */
-    private class TuscanyWork implements Work {
-
-        Runnable job;
-
-        public TuscanyWork(Runnable job) {
-            this.job = job;
-        }
-
-        public void release() {
-        }
-
-        public void run() {
-            job.run();
-        }
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/TransportMonitor.java b/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/TransportMonitor.java
deleted file mode 100644
index c68eacd21c..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/TransportMonitor.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.service.jetty;
-
-/**
- * The monitoring interfaces used by the Jetty system service
- *
- * @version $$Rev$$ $$Date$$
- */
-public interface TransportMonitor {
-
-    /**
-     * Called after the service is initialized
-     */
-    void started();
-
-    /**
-     * Called after the service is stopped
-     */
-    void shutdown();
-
-    void warn(String msg, Object...args);
-
-    void debug(String msg, Object...args);
-
-}
diff --git a/branches/sca-java-M2/sca/services/transports/http.jetty/src/test/java/org/apache/tuscany/service/jetty/JettyServiceImplTestCase.java b/branches/sca-java-M2/sca/services/transports/http.jetty/src/test/java/org/apache/tuscany/service/jetty/JettyServiceImplTestCase.java
deleted file mode 100644
index 987d7d9a16..0000000000
--- a/branches/sca-java-M2/sca/services/transports/http.jetty/src/test/java/org/apache/tuscany/service/jetty/JettyServiceImplTestCase.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.service.jetty;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.spi.services.work.WorkScheduler;
-
-import junit.framework.TestCase;
-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 org.easymock.IAnswer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JettyServiceImplTestCase 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 int HTTP_PORT = 8585;
-
-    private TransportMonitor monitor;
-    private WorkScheduler scheduler;
-    private ExecutorService executor = Executors.newCachedThreadPool();
-
-    /**
-     * Verifies requests are properly routed according to the servlet mapping
-     */
-    public void testRegisterServletMapping() throws Exception {
-        JettyServiceImpl service = new JettyServiceImpl(monitor);
-        service.setHttpPort(HTTP_PORT);
-        service.init();
-        TestServlet servlet = new TestServlet();
-        service.registerMapping("/", servlet);
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        read(client);
-        service.destroy();
-        assertTrue(servlet.invoked);
-    }
-
-    public void testUseWorkScheduler() throws Exception {
-        JettyServiceImpl service = new JettyServiceImpl(monitor, scheduler);
-        service.setDebug(true);
-        service.setHttpPort(HTTP_PORT);
-        service.init();
-        TestServlet servlet = new TestServlet();
-        service.registerMapping("/", servlet);
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        read(client);
-        service.destroy();
-        assertTrue(servlet.invoked);
-    }
-
-    public void testRestart() throws Exception {
-        JettyServiceImpl service = new JettyServiceImpl(monitor);
-        service.setHttpPort(HTTP_PORT);
-        service.init();
-        service.destroy();
-        service.init();
-        service.destroy();
-    }
-
-    public void testNoMappings() throws Exception {
-        JettyServiceImpl service = new JettyServiceImpl(monitor);
-        service.setHttpPort(HTTP_PORT);
-        service.init();
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST1.getBytes());
-        os.flush();
-        read(client);
-        service.destroy();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        //executor.submit();
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        monitor = createMock(TransportMonitor.class);
-        scheduler = createMock(WorkScheduler.class);
-        scheduler.scheduleWork(isA(Runnable.class));
-
-        expectLastCall().andStubAnswer(new IAnswer() {
-            public Object answer() throws Throwable {
-                Runnable runnable = (Runnable) getCurrentArguments()[0];
-                executor.execute(runnable);
-                return null;
-            }
-        });
-        replay(scheduler);
-    }
-
-    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 {
-        boolean invoked;
-
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            invoked = true;
-            OutputStream writer = resp.getOutputStream();
-            try {
-                writer.write("result".getBytes());
-            } finally {
-                writer.close();
-            }
-        }
-
-
-    }
-}