Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 47812 invoked from network); 23 Dec 2005 01:26:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Dec 2005 01:26:04 -0000 Received: (qmail 82572 invoked by uid 500); 23 Dec 2005 01:26:04 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 82552 invoked by uid 500); 23 Dec 2005 01:26:04 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 82542 invoked by uid 99); 23 Dec 2005 01:26:04 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2005 17:26:04 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 22 Dec 2005 17:26:02 -0800 Received: (qmail 47593 invoked by uid 65534); 23 Dec 2005 01:25:42 -0000 Message-ID: <20051223012542.47590.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358676 - in /incubator/activemq/trunk/activeio: activeio-core/ activeio-core/src/main/java/org/activeio/ activeio-core/src/main/java/org/apache/activeio/oneport/jetty/ activeio-core/src/test/java/org/activeio/ activeio-core/src/test/java/o... Date: Fri, 23 Dec 2005 01:25:40 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Thu Dec 22 17:25:30 2005 New Revision: 358676 URL: http://svn.apache.org/viewcvs?rev=358676&view=rev Log: moved the oneport jetty integration into it's own m2 module Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/.classpath incubator/activemq/trunk/activeio/activeio-oneport-jetty/.project incubator/activemq/trunk/activeio/activeio-oneport-jetty/.settings/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/.settings/org.eclipse.jdt.core.prefs incubator/activemq/trunk/activeio/activeio-oneport-jetty/.wtpmodules incubator/activemq/trunk/activeio/activeio-oneport-jetty/LICENSE.txt incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/jetty/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/resources/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/TestServlet.java incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/resources/ Removed: incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/activeio/ incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/oneport/jetty/ incubator/activemq/trunk/activeio/activeio-core/src/test/java/org/activeio/ incubator/activemq/trunk/activeio/activeio-core/src/test/java/org/apache/activeio/oneport/jetty/ Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/pom.xml?rev=358676&r1=358675&r2=358676&view=diff ============================================================================== --- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original) +++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Thu Dec 22 17:25:30 2005 @@ -38,13 +38,6 @@ 2.0 - - - jetty - org.mortbay.jetty - 5.1.2 - - junit Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/.classpath URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/.classpath?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/.classpath (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/.classpath Thu Dec 22 17:25:30 2005 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/.project URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/.project?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/.project (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/.project Thu Dec 22 17:25:30 2005 @@ -0,0 +1,28 @@ + + activeio-oneport-jetty + A Openport OpenORB adapter + + + + org.eclipse.wst.common.modulecore.ComponentStructuralBuilder + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.modulecore.ModuleCoreNature + + \ No newline at end of file Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/.settings/org.eclipse.jdt.core.prefs URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/.settings/org.eclipse.jdt.core.prefs?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/.settings/org.eclipse.jdt.core.prefs (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/.settings/org.eclipse.jdt.core.prefs Thu Dec 22 17:25:30 2005 @@ -0,0 +1,5 @@ +#Tue Dec 22 19:33:47 EST 2037 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.source=1.4 Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/.wtpmodules URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/.wtpmodules?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/.wtpmodules (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/.wtpmodules Thu Dec 22 17:25:30 2005 @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/LICENSE.txt URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/LICENSE.txt?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/LICENSE.txt (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/LICENSE.txt Thu Dec 22 17:25:30 2005 @@ -0,0 +1,203 @@ + + 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. + Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/pom.xml Thu Dec 22 17:25:30 2005 @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.apache.activeio + activeio-project + ../pom.xml + 3.0-SNAPSHOT + + + activeio-oneport-jetty + ActiveIO :: Openport :: OpenORB + A Openport OpenORB adapter + + + + + org.apache.activeio + activeio-core + ${version} + + + org.apache.activeio + activeio-core + ${version} + test-jar + + + backport-util-concurrent + backport-util-concurrent + + + + + jetty + org.mortbay.jetty + 5.1.2 + + + geronimo-spec + geronimo-spec-j2ee + 1.4-rc4 + + + + + junit + junit + + + commons-logging + commons-logging + + + log4j + log4j + + + + + Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/main/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java Thu Dec 22 17:25:30 2005 @@ -0,0 +1,53 @@ +/** + * + * Copyright 2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activeio.oneport.jetty; + +import java.io.IOException; +import java.net.ServerSocket; + +import org.apache.activeio.adapter.AsyncToSyncChannelServer; +import org.apache.activeio.adapter.SyncChannelServerToServerSocket; +import org.apache.activeio.oneport.HttpRecognizer; +import org.apache.activeio.oneport.OnePortAsyncChannelServer; +import org.apache.activeio.packet.sync.SyncChannelServer; +import org.mortbay.http.SocketListener; +import org.mortbay.util.InetAddrPort; + +/** + * + */ +public class JettyOnePortSocketListener extends SocketListener { + + private static final long serialVersionUID = 3257567321504561206L; + + private final OnePortAsyncChannelServer channelServer; + + public JettyOnePortSocketListener(OnePortAsyncChannelServer channelServer) { + this.channelServer = channelServer; + } + + public JettyOnePortSocketListener(OnePortAsyncChannelServer channelServer, InetAddrPort arg0) { + super(arg0); + this.channelServer = channelServer; + } + + protected ServerSocket newServerSocket(InetAddrPort addrPort, int backlog) throws IOException { + SyncChannelServer syncServer = AsyncToSyncChannelServer.adapt(channelServer.bindAsyncChannel(HttpRecognizer.HTTP_RECOGNIZER)); + syncServer.start(); + return new SyncChannelServerToServerSocket(syncServer); + } +} Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java Thu Dec 22 17:25:30 2005 @@ -0,0 +1,65 @@ +/** + * + * Copyright 2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activeio.oneport.jetty; + +import org.apache.activeio.oneport.OnePortAsyncChannelServerTest; +import org.apache.activeio.oneport.jetty.JettyOnePortSocketListener; +import org.mortbay.http.HttpContext; +import org.mortbay.http.HttpServer; +import org.mortbay.jetty.servlet.ServletHandler; + +import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue; + +/** + * + */ +public class JettyOnePortSocketListenerTest extends OnePortAsyncChannelServerTest { + + static public BlockingQueue staticResultSlot; + + private HttpServer jetty; + + protected void startHTTPServer() throws Exception { + staticResultSlot = resultSlot; + + // Create the server + jetty = new HttpServer(); + + // Create a port listener + JettyOnePortSocketListener listener = new JettyOnePortSocketListener(server); + jetty.addListener(listener); + + // Create a context + HttpContext context = new HttpContext(); + context.setContextPath("/"); + jetty.addContext(context); + + // Create a servlet container + ServletHandler servlets = new ServletHandler(); + context.addHandler(servlets); + + // Map a servlet onto the container + servlets.addServlet("Test", "*", TestServlet.class.getName()); + + // Start the http server + jetty.start(); + } + + protected void stopHTTPServer() throws InterruptedException { + jetty.stop(); + } +} Added: incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/TestServlet.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/TestServlet.java?rev=358676&view=auto ============================================================================== --- incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/TestServlet.java (added) +++ incubator/activemq/trunk/activeio/activeio-oneport-jetty/src/test/java/org/apache/activeio/oneport/jetty/TestServlet.java Thu Dec 22 17:25:30 2005 @@ -0,0 +1,42 @@ +/** + * + * Copyright 2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activeio.oneport.jetty; + +import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + + +public class TestServlet extends HttpServlet { + + private static final long serialVersionUID = 3257286933137733686L; + + protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + try { + JettyOnePortSocketListenerTest.staticResultSlot.offer("HTTP", 1, TimeUnit.MILLISECONDS); + resp.getOutputStream().print("Hello World!"); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file