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/27 20:56:23 UTC
svn commit: r641963 - in /geronimo/sandbox/concurrent/concurrent-tests: ./
concurrent-ear/ concurrent-ejb/ concurrent-ejb/src/
concurrent-ejb/src/main/ concurrent-ejb/src/main/java/
concurrent-ejb/src/main/java/org/ concurrent-ejb/src/main/java/org/apa...
Author: gawor
Date: Thu Mar 27 12:56:14 2008
New Revision: 641963
URL: http://svn.apache.org/viewvc?rev=641963&view=rev
Log:
add ejb module -- will be used to test security context propagation
Added:
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/LICENSE.txt (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/NOTICE.txt (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/pom.xml (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/Calculator.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorLocal.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorRemote.java (with props)
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml (with props)
Modified:
geronimo/sandbox/concurrent/concurrent-tests/concurrent-ear/pom.xml
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml
geronimo/sandbox/concurrent/concurrent-tests/pom.xml
Modified: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ear/pom.xml?rev=641963&r1=641962&r2=641963&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ear/pom.xml (original)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ear/pom.xml Thu Mar 27 12:56:14 2008
@@ -57,6 +57,13 @@
<version>${version}</version>
<type>war</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>concurrent-ejb</artifactId>
+ <version>${version}</version>
+ <type>ejb</type>
+ </dependency>
</dependencies>
<build>
@@ -68,6 +75,11 @@
<description>Concurrent TestSuite EAR</description>
<version>5</version>
<modules>
+ <ejbModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>concurrent-ejb</artifactId>
+ <bundleFileName>concurrent-ejb-${version}.jar</bundleFileName>
+ </ejbModule>
<webModule>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>concurrent-war</artifactId>
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/LICENSE.txt?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/LICENSE.txt (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/LICENSE.txt Thu Mar 27 12:56:14 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-ejb/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/NOTICE.txt?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/NOTICE.txt (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/NOTICE.txt Thu Mar 27 12:56:14 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-ejb/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/pom.xml?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/pom.xml (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/pom.xml Thu Mar 27 12:56:14 2008
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES 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-ejb</artifactId>
+ <name>Geronimo TestSuite :: Concurrent TestSuite :: EJB</name>
+ <packaging>jar</packaging>
+
+ <description>This project executes testcases for your testsuite</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/Calculator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/Calculator.java?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/Calculator.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/Calculator.java Thu Mar 27 12:56:14 2008
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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 javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+
+@Stateless(name="Calculator")
+public class Calculator implements CalculatorRemote, CalculatorLocal {
+
+ public int sum(int add1, int add2) {
+ return add1+add2;
+ }
+
+ @RolesAllowed({"employee"})
+ public int multiply(int mul1, int mul2) {
+ return mul1*mul2;
+ }
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/Calculator.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorLocal.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorLocal.java?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorLocal.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorLocal.java Thu Mar 27 12:56:14 2008
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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 interface CalculatorLocal {
+
+ public int sum(int add1, int add2);
+
+ public int multiply(int mul1, int mul2);
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorLocal.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorRemote.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorRemote.java?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorRemote.java (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorRemote.java Thu Mar 27 12:56:14 2008
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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 javax.ejb.Remote;
+
+@Remote
+public interface CalculatorRemote {
+
+ public int sum(int add1, int add2);
+
+ public int multiply(int mul1, int mul2);
+
+}
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/java/org/apache/geronimo/concurrent/test/CalculatorRemote.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=641963&view=auto
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml (added)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml Thu Mar 27 12:56:14 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!-- $Rev: 589923 $ $Date: 2007-10-29 21:15:01 -0400 (Mon, 29 Oct 2007) $ -->
+
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Calculator</ejb-name>
+ <jndi-name>Calculator</jndi-name>
+ </session>
+ </enterprise-beans>
+</openejb-jar>
Propchange: geronimo/sandbox/concurrent/concurrent-tests/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=641963&r1=641962&r2=641963&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml (original)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/pom.xml Thu Mar 27 12:56:14 2008
@@ -58,7 +58,17 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>concurrent-ejb</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Modified: 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=641963&r1=641962&r2=641963&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java (original)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/java/org/apache/geronimo/concurrent/test/ContextServiceServlet.java Thu Mar 27 12:56:14 2008
@@ -47,7 +47,7 @@
throws IOException {
System.out.println(contextService);
-
+
String testName = (String)request.getParameter("testName");
System.out.println(testName);
Modified: 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=641963&r1=641962&r2=641963&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Mar 27 12:56:14 2008
@@ -36,4 +36,15 @@
</dep:environment>
+ <security-realm-name>geronimo-admin</security-realm-name>
+
+ <security>
+ <role-mappings>
+ <role role-name="employee">
+ <principal name="admin"
+ class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" />
+ </role>
+ </role-mappings>
+ </security>
+
</web-app>
Modified: 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=641963&r1=641962&r2=641963&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/concurrent/concurrent-tests/concurrent-war/src/main/webapp/WEB-INF/web.xml Thu Mar 27 12:56:14 2008
@@ -56,6 +56,10 @@
<servlet-name>ContextServiceServlet</servlet-name>
<url-pattern>/ContextServiceServlet</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ContextServiceServlet</servlet-name>
+ <url-pattern>/secure/ContextServiceServlet</url-pattern>
+ </servlet-mapping>
<env-entry>
<description>Welcome message</description>
@@ -63,5 +67,24 @@
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>Hello</env-entry-value>
</env-entry>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>secure</web-resource-name>
+ <url-pattern>/secure/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>employee</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>geronimo-admin</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>employee</role-name>
+ </security-role>
</web-app>
Modified: geronimo/sandbox/concurrent/concurrent-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/concurrent/concurrent-tests/pom.xml?rev=641963&r1=641962&r2=641963&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-tests/pom.xml (original)
+++ geronimo/sandbox/concurrent/concurrent-tests/pom.xml Thu Mar 27 12:56:14 2008
@@ -46,6 +46,7 @@
</build>
<modules>
+ <module>concurrent-ejb</module>
<module>concurrent-war</module>
<module>concurrent-ear</module>
</modules>