You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/03/25 20:35:32 UTC
svn commit: r640956 [1/2] - in
/geronimo/sandbox/concurrent/concurrent-tests: ./ concurrent-war/
concurrent-war/src/ concurrent-war/src/main/ concurrent-war/src/main/java/
concurrent-war/src/main/java/org/ concurrent-war/src/main/java/org/apache/
concu...
Author: gawor
Date: Tue Mar 25 12:35:27 2008
New Revision: 640956
URL: http://svn.apache.org/viewvc?rev=640956&view=rev
Log:
some basic app level tests but still needs a lot of work
Added:
geronimo/sandbox/concurrent/concurrent-tests/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/LICENSE.txt (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/NOTICE.txt (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryTest.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/pom.xml (with props)
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/LICENSE.txt?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/LICENSE.txt (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/LICENSE.txt Tue Mar 25 12:35:27 2008
@@ -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.
+
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/NOTICE.txt?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/NOTICE.txt (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/NOTICE.txt Tue Mar 25 12:35:27 2008
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml Tue Mar 25 12:35:27 2008
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>concurrent-tests</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>concurrent-war</artifactId>
+ <name>Geronimo TestSuite :: Concurrent TestSuite :: WAR</name>
+ <packaging>war</packaging>
+
+ <description>This project executes testcases for your testsuite</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-concurrent_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-concurrent-management</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>install</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ <!--
+ Merging the configuration of this plugin with the one it inherits.
+ Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+ -->
+ <configuration>
+ <grandParent>true</grandParent>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>webAppName</name>
+ <value>${artifactId}-${version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${groupId}/${artifactId}/1.0/war</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.util.concurrent.ContextService;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ContextServiceServlet extends HttpServlet {
+
+ private final static Log LOG = LogFactory.getLog(ContextServiceServlet.class);
+
+ @Resource
+ ContextService contextService;
+
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException {
+
+ System.out.println(contextService);
+
+ String testName = (String)request.getParameter("testName");
+ String id = (String)request.getParameter("id");
+ System.out.println(testName + " " + id);
+
+ try {
+ testContextService();
+ } catch (Exception e) {
+ LOG.error("Test failed: " + e.getMessage(), e);
+ e.printStackTrace(response.getWriter());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Test failed");
+ }
+
+ }
+
+ private void testContextService() throws Exception {
+ System.out.println(contextService);
+
+ TestRunnable testRunnable = new TestRunnable(2 * 1000);
+ Runnable r = (Runnable)contextService.createContextObject(testRunnable, new Class [] {Runnable.class});
+
+ Thread t = new Thread(new LoopRunnable(r));
+ t.start();
+
+ Thread.sleep(5 * 1000);
+ }
+
+ private static class LoopRunnable implements Runnable {
+ Runnable target;
+
+ public LoopRunnable(Runnable target) {
+ this.target = target;
+ }
+
+ public void run() {
+ try {
+ while(true) {
+ Thread.sleep(2 * 1000);
+ target.run();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.io.IOException;
+import java.util.concurrent.Future;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.util.concurrent.ManagedExecutorService;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ManagedExecutorServiceServlet extends HttpServlet {
+
+ private final static Log LOG = LogFactory.getLog(ManagedExecutorServiceServlet.class);
+
+ @Resource
+ ManagedExecutorService executorService;
+
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException {
+
+ System.out.println(executorService);
+
+ String testName = (String)request.getParameter("testName");
+ String id = (String)request.getParameter("id");
+ System.out.println(testName + " " + id);
+
+ try {
+ testManagedExecutorService(id);
+ } catch (Exception e) {
+ LOG.error("Test failed: " + e.getMessage(), e);
+ e.printStackTrace(response.getWriter());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Test failed");
+ }
+ }
+
+ private void testManagedExecutorService(String id) throws Exception {
+ if ("1".equals(id)) {
+ Future t1 = executorService.submit(new TestRunnable(1000 * 30));
+ Future t2 = executorService.submit(new TestIdentifiableRunnable(1000 * 60));
+ } else {
+ System.out.println("Unknown test id: " + id);
+ }
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceServlet.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.io.IOException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.util.concurrent.ManagedScheduledExecutorService;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ManagedScheduledExecutorServiceServlet extends HttpServlet {
+
+ private final static Log LOG = LogFactory.getLog(ManagedScheduledExecutorServiceServlet.class);
+
+ @Resource
+ ManagedScheduledExecutorService scheduledExecutorService;
+
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException {
+
+ System.out.println(scheduledExecutorService);
+
+ String testName = (String)request.getParameter("testName");
+ String id = (String)request.getParameter("id");
+ System.out.println(testName + " " + id);
+
+ try {
+ testManagedScheduledExecutorService(id);
+ } catch (Exception e) {
+ LOG.error("Test failed: " + e.getMessage(), e);
+ e.printStackTrace(response.getWriter());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Test failed");
+ }
+
+ }
+
+ private void testManagedScheduledExecutorService(String id) throws Exception {
+ if ("1".equals(id)) {
+ Future t1 = scheduledExecutorService.scheduleWithFixedDelay(new TestRunnable(1000 * 10), 5, 5, TimeUnit.SECONDS);
+ Thread.sleep(5 * 1000);
+ } else {
+ System.out.println("Unknown test id: " + id);
+ }
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceServlet.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.util.concurrent.ManagedThreadFactory;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ManagedThreadFactoryServlet extends HttpServlet {
+
+ private final static Log LOG = LogFactory.getLog(ManagedThreadFactoryServlet.class);
+
+ @Resource
+ ManagedThreadFactory threadFactory;
+
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException {
+
+ System.out.println(threadFactory);
+
+ String testName = (String)request.getParameter("testName");
+ String id = (String)request.getParameter("id");
+ System.out.println(testName + " " + id);
+
+ try {
+ testManagedThreadFactory(id);
+ } catch (Exception e) {
+ LOG.error("Test failed: " + e.getMessage(), e);
+ e.printStackTrace(response.getWriter());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Test failed");
+ }
+
+ }
+
+ private void testManagedThreadFactory(String id) throws Exception {
+ if ("1".equals(id)) {
+ Thread t1 = threadFactory.newThread(new TestRunnable(1000 * 30));
+ t1.start();
+ } else if ("2".equals(id)) {
+ Thread t2 = threadFactory.newThread(new TestIdentifiableRunnable(1000 * 30));
+ t2.start();
+ } else if ("3".equals(id)) {
+ Thread t3 = threadFactory.newThread(new TestRunnable("TestRunnable long", 1000 * 60 * 2));
+ t3.start();
+ } else if ("4".equals(id)) {
+ Thread t3 = threadFactory.newThread(new ThreadCreator());
+ t3.start();
+ } else {
+ System.out.println("Unknown test id: " + id);
+ }
+ }
+
+ private class ThreadCreator implements Runnable {
+ public void run() {
+ try {
+ while(true) {
+ threadFactory.newThread(new TestRunnable(1000 * 5)).start();
+ System.out.println("created thread");
+ Thread.sleep(2 * 1000);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ManagedThreadFactoryServlet.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.util.Locale;
+
+import javax.util.concurrent.Identifiable;
+
+public class TestIdentifiableRunnable implements Runnable, Identifiable {
+
+ long delay;
+
+ public TestIdentifiableRunnable(long delay) {
+ this.delay = delay;
+ }
+
+ public void run() {
+ try {
+ Thread.sleep(this.delay);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public String toString() {
+ return "TestIdentifiableRunnable";
+ }
+
+ public String getIdentityDescription(Locale locale) {
+ if (Locale.CANADA.equals(locale)) {
+ return "TestIdentifiableRunnable Description CA";
+ } else {
+ return "TestIdentifiableRunnable Description";
+ }
+ }
+
+ public String getIdentityName() {
+ return "TestIdentifiableRunnable Name";
+ }
+
+}
\ No newline at end of file
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestIdentifiableRunnable.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+public class TestRunnable implements Runnable {
+ long delay;
+ String name;
+
+ public TestRunnable(String name, long delay) {
+ this.delay = delay;
+ this.name = name;
+ }
+
+ public TestRunnable(long delay) {
+ this("TestRunnable", delay);
+ }
+
+ public void run() {
+ try {
+ Thread.sleep(this.delay);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ System.out.println("Running...");
+ }
+
+ public String toString() {
+ return this.name;
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/TestRunnable.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue Mar 25 12:35:27 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
+
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>${groupId}</dep:groupId>
+ <dep:artifactId>${artifactId}</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>war</dep:type>
+ </dep:moduleId>
+
+ <dep:dependencies>
+ <dep:dependency>
+ <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+ <dep:artifactId>concurrent</dep:artifactId>
+ <dep:version>2.2-SNAPSHOT</dep:version>
+ <dep:type>car</dep:type>
+ </dep:dependency>
+ </dep:dependencies>
+
+ </dep:environment>
+
+</web-app>
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml Tue Mar 25 12:35:27 2008
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>ManagedExecutorServiceServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.concurrent.test.ManagedExecutorServiceServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ManagedExecutorServiceServlet</servlet-name>
+ <url-pattern>/ManagedExecutorServiceServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>ManagedScheduledExecutorServiceServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.concurrent.test.ManagedScheduledExecutorServiceServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ManagedScheduledExecutorServiceServlet</servlet-name>
+ <url-pattern>/ManagedScheduledExecutorServiceServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>ManagedThreadFactoryServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.concurrent.test.ManagedThreadFactoryServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ManagedThreadFactoryServlet</servlet-name>
+ <url-pattern>/ManagedThreadFactoryServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>ContextServiceServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.concurrent.test.ContextServiceServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ContextServiceServlet</servlet-name>
+ <url-pattern>/ContextServiceServlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+
+public class ConcurrentTest extends TestSupport {
+
+ protected String baseURL = "http://localhost:8080/";
+ protected static final int TIMEOUT = 1000 * 60 * 2;
+ protected JMXConnector jmxConnector;
+
+ @BeforeMethod
+ public void setUp() throws Exception {
+ System.out.println("setUp");
+ Map environment = new HashMap();
+ String[] credentials = new String[]{"system", "manager"};
+ environment.put(JMXConnector.CREDENTIALS, credentials);
+
+ JMXServiceURL address =
+ new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost/JMXConnector");
+ this.jmxConnector = JMXConnectorFactory.connect(address, environment);
+ }
+
+ @AfterMethod
+ public void tearDown() throws Exception {
+ System.out.println("tearDown");
+ jmxConnector.close();
+ }
+
+ protected void invokeTest(String testName) throws Exception {
+ invokeTest("ConcurrentServlet", testName);
+ }
+
+ protected void invokeTest(String servletName, String testName) throws Exception {
+ // cause a new thread to be created
+ String warName = System.getProperty("webAppName");
+ String servlet = "/" + servletName + "?testName=" + testName;
+ URL url = new URL(baseURL + warName + servlet);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ try {
+ String reply = call(conn);
+ assertEquals("responseCode", 200, conn.getResponseCode());
+ } finally {
+ conn.disconnect();
+ }
+ }
+
+ /*
+
+ private boolean find(BufferedReader reader, String text)
+ throws IOException {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ if (line.indexOf(text) != -1) {
+ return true;
+ }
+ }
+ return false;
+ }
+*/
+
+ protected String call(HttpURLConnection conn) throws IOException {
+ conn.setConnectTimeout(30 * 1000);
+ conn.setReadTimeout(30 * 1000);
+ conn.setUseCaches(false);
+ conn.setRequestMethod("GET");
+ conn.setRequestProperty("Content-Type", "text/plain");
+
+ InputStream is = null;
+
+ try {
+ is = conn.getInputStream();
+ } catch (IOException e) {
+ is = conn.getErrorStream();
+ }
+
+ StringBuffer buf = new StringBuffer();
+ BufferedReader in = new BufferedReader(new InputStreamReader(is));
+ String inputLine;
+ while ((inputLine = in.readLine()) != null) {
+ System.out.println(inputLine);
+ buf.append(inputLine);
+ }
+ in.close();
+
+ return buf.toString();
+ }
+
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ConcurrentTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import org.testng.annotations.Test;
+
+public class ContextServiceTest extends ConcurrentTest {
+
+ @Override
+ protected void invokeTest(String testName) throws Exception {
+ invokeTest("ContextServiceServlet", testName);
+ }
+
+ @Test
+ public void test() throws Exception {
+ invokeTest("testContext");
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ContextServiceTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,111 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.util.Set;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.testng.annotations.Test;
+
+public class ManagedExecutorServiceTest extends ConcurrentTest {
+
+ @Override
+ protected void invokeTest(String testName) throws Exception {
+ invokeTest("ManagedExecutorServiceServlet", testName);
+ }
+
+ @Test
+ public void testThreadsField() throws Exception {
+ MBeanServerConnection mbServerConn = this.jmxConnector.getMBeanServerConnection();
+
+ String name = "DefaultManagedExecutorService";
+
+ Set<ObjectName> objectNameSet =
+ mbServerConn.queryNames(new ObjectName("*:j2eeType=ManagedExecutorService,name=" + name + ",*"), null);
+ assertEquals(1, objectNameSet.size());
+
+ ObjectName executorService = objectNameSet.iterator().next();
+
+ invokeTest("testManagedExecutorService&id=1");
+
+ ObjectName task1Thread = null;
+ ObjectName task2Thread = null;
+
+ long slept = 0;
+ while (slept < TIMEOUT) {
+ String[] threadNames = (String[])mbServerConn.getAttribute(executorService, "threads");
+ if (threadNames != null && threadNames.length > 0) {
+ for (String threadName : threadNames) {
+ ObjectName threadObjectName = new ObjectName(threadName);
+
+ String taskName = (String)mbServerConn.getAttribute(threadObjectName, "taskIdentityName");
+ String taskDesc = (String)mbServerConn.getAttribute(threadObjectName, "taskIdentityDescription");
+
+ if ("TestRunnable".equals(taskName) && "TestRunnable".equals(taskDesc)) {
+ if (task1Thread == null) {
+ task1Thread = threadObjectName;
+ } else if (!task1Thread.equals(threadObjectName)) {
+ fail("Task1 was found on " + task1Thread + " and " + threadObjectName);
+ }
+ } else if ("TestIdentifiableRunnable Name".equals(taskName) && "TestIdentifiableRunnable Description".equals(taskDesc)) {
+ if (task2Thread == null) {
+ task2Thread = threadObjectName;
+ } else if (!task2Thread.equals(threadObjectName)) {
+ fail("Task2 was found on " + task2Thread + " and " + threadObjectName);
+ }
+ }
+ }
+ // found both, we're done
+ if (task1Thread != null && task2Thread != null) {
+ break;
+ }
+ }
+ Thread.sleep(1000 * 10);
+ slept += 1000 * 10;
+ }
+
+ assertTrue("task1 not found", task1Thread != null);
+ assertTrue("task2 not found", task2Thread != null);
+
+ System.out.println("Task1 found on " + task1Thread);
+ System.out.println("Task2 found on " + task2Thread);
+
+ assertTrue("task1 finished", pollThread(task1Thread));
+ assertTrue("task2 finished", pollThread(task2Thread));
+ }
+
+ private boolean pollThread(ObjectName threadObjectName) throws Exception {
+ MBeanServerConnection mbServerConn = this.jmxConnector.getMBeanServerConnection();
+ long slept = 0;
+ while (slept < TIMEOUT) {
+ String taskName = (String)mbServerConn.getAttribute(threadObjectName, "taskIdentityName");
+ String taskDesc = (String)mbServerConn.getAttribute(threadObjectName, "taskIdentityDescription");
+ System.out.println(taskName + " " + taskDesc);
+ if (taskName == null && taskDesc == null) {
+ return true;
+ }
+ Thread.sleep(1000 * 10);
+ slept += 1000 * 10;
+ }
+ return false;
+ }
+
+}
\ No newline at end of file
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedExecutorServiceTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java?rev=640956&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java Tue Mar 25 12:35:27 2008
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.concurrent.test;
+
+import java.util.Set;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.testng.annotations.Test;
+
+public class ManagedScheduledExecutorServiceTest extends ConcurrentTest {
+
+ @Override
+ protected void invokeTest(String testName) throws Exception {
+ invokeTest("ManagedScheduledExecutorServiceServlet", testName);
+ }
+
+ @Test
+ public void testThreadsField() throws Exception {
+ MBeanServerConnection mbServerConn = this.jmxConnector.getMBeanServerConnection();
+
+ String name = "DefaultManagedScheduledExecutorService";
+
+ Set<ObjectName> objectNameSet =
+ mbServerConn.queryNames(new ObjectName("*:j2eeType=ManagedExecutorService,name=" + name + ",*"), null);
+ assertEquals(1, objectNameSet.size());
+
+ ObjectName executorService = objectNameSet.iterator().next();
+
+ invokeTest("testManagedScheduledExecutorService&id=1");
+
+ }
+
+}
\ No newline at end of file
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/test/java/org/apache/geronimo/concurrent/test/ManagedScheduledExecutorServiceTest.java
------------------------------------------------------------------------------
svn:executable = *