Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 68854 invoked from network); 10 Dec 2005 00:48:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Dec 2005 00:48:07 -0000 Received: (qmail 25815 invoked by uid 500); 10 Dec 2005 00:48:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25795 invoked by uid 500); 10 Dec 2005 00:48:06 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 25777 invoked by uid 99); 10 Dec 2005 00:48:06 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2005 16:48:06 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 09 Dec 2005 16:48:05 -0800 Received: (qmail 68791 invoked by uid 65534); 10 Dec 2005 00:47:44 -0000 Message-ID: <20051210004744.68790.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r355668 - in /geronimo/trunk: assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var/config/ configs/ldap-realm/ configs/ldap-realm/src/ configs/ldap-r... Date: Sat, 10 Dec 2005 00:47:42 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Fri Dec 9 16:47:39 2005 New Revision: 355668 URL: http://svn.apache.org/viewcvs?rev=355668&view=rev Log: GERONIMO-1275 ldap realm. Untested. config and add to jetty and tomcat servers Added: geronimo/trunk/configs/ldap-realm/ geronimo/trunk/configs/ldap-realm/LICENSE.txt geronimo/trunk/configs/ldap-realm/NOTICE.txt geronimo/trunk/configs/ldap-realm/maven.xml geronimo/trunk/configs/ldap-realm/project.properties geronimo/trunk/configs/ldap-realm/project.xml geronimo/trunk/configs/ldap-realm/src/ geronimo/trunk/configs/ldap-realm/src/plan/ geronimo/trunk/configs/ldap-realm/src/plan/plan.xml Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=355668&r1=355667&r2=355668&view=diff ============================================================================== --- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original) +++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Dec 9 16:47:39 2005 @@ -100,6 +100,15 @@ geronimo + ldap-realm + car + ${pom.currentVersion} + + install + + + + geronimo system-database car ${pom.currentVersion} Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355668&r1=355667&r2=355668&view=diff ============================================================================== --- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original) +++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Dec 9 16:47:39 2005 @@ -62,6 +62,7 @@ ${PlanLdapPort} + ${PlanServerHostname} Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=355668&r1=355667&r2=355668&view=diff ============================================================================== --- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original) +++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri Dec 9 16:47:39 2005 @@ -100,6 +100,15 @@ geronimo + ldap-realm + car + ${pom.currentVersion} + + install + + + + geronimo system-database car ${pom.currentVersion} Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355668&r1=355667&r2=355668&view=diff ============================================================================== --- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original) +++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri Dec 9 16:47:39 2005 @@ -62,6 +62,7 @@ ${PlanLdapPort} + Added: geronimo/trunk/configs/ldap-realm/LICENSE.txt URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/LICENSE.txt?rev=355668&view=auto ============================================================================== --- geronimo/trunk/configs/ldap-realm/LICENSE.txt (added) +++ geronimo/trunk/configs/ldap-realm/LICENSE.txt Fri Dec 9 16:47:39 2005 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + Added: geronimo/trunk/configs/ldap-realm/NOTICE.txt URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/NOTICE.txt?rev=355668&view=auto ============================================================================== --- geronimo/trunk/configs/ldap-realm/NOTICE.txt (added) +++ geronimo/trunk/configs/ldap-realm/NOTICE.txt Fri Dec 9 16:47:39 2005 @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + Added: geronimo/trunk/configs/ldap-realm/maven.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/maven.xml?rev=355668&view=auto ============================================================================== --- geronimo/trunk/configs/ldap-realm/maven.xml (added) +++ geronimo/trunk/configs/ldap-realm/maven.xml Fri Dec 9 16:47:39 2005 @@ -0,0 +1,26 @@ + + + + + + + + + + + Added: geronimo/trunk/configs/ldap-realm/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/project.properties?rev=355668&view=auto ============================================================================== --- geronimo/trunk/configs/ldap-realm/project.properties (added) +++ geronimo/trunk/configs/ldap-realm/project.properties Fri Dec 9 16:47:39 2005 @@ -0,0 +1,26 @@ +## +## +## Copyright 2005 The Apache Software Foundation +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## + +## +## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ +## + +maven.multiproject.type=car + +# just use basic GBean deployer +geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car + Added: geronimo/trunk/configs/ldap-realm/project.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/project.xml?rev=355668&view=auto ============================================================================== --- geronimo/trunk/configs/ldap-realm/project.xml (added) +++ geronimo/trunk/configs/ldap-realm/project.xml Fri Dec 9 16:47:39 2005 @@ -0,0 +1,263 @@ + + + + + + + 3 + ../../etc/project.xml + ldap-realm + LDAP security realm + + + + + geronimo + geronimo-packaging-plugin + ${geronimo_version} + plugin + + + geronimo + geronimo-gbean-deployer + ${geronimo_version} + car + + + + geronimo + j2ee-security + ${geronimo_version} + car + + true + + + + geronimo + geronimo-core + ${geronimo_version} + + + geronimo + geronimo-common + ${geronimo_version} + + + geronimo + geronimo-connector + ${geronimo_version} + + + geronimo + geronimo-timer + ${geronimo_version} + + + geronimo + geronimo-webservices + ${geronimo_version} + + + geronimo + geronimo-client + ${geronimo_version} + + + geronimo + geronimo-axis + ${geronimo_version} + + + geronimo + geronimo-servicemix + ${geronimo_version} + + + openejb + openejb-core + ${openejb_version} + + + xstream + xstream + ${xstream_version} + + + xpp3 + xpp3 + ${xpp3_version} + + + asm + asm + ${asm_version} + + + activemq + activemq-gbean-management + ${activemq_version} + + + activeio + activeio + ${activeio_version} + + + scout + jaxr-api + ${scout_version} + + + + scout + scout + ${scout_version} + + + + juddi + juddi + ${juddi_version} + + + + jdom + jdom + ${jdom_version} + + + + geronimo + geronimo-derby + ${pom.currentVersion} + + + + org.apache.derby + derby + ${derby_version} + + + + org.apache.derby + derbynet + ${derby_version} + + + + + geronimo + geronimo-system + ${geronimo_version} + + + + geronimo + geronimo-gbean-deployer + ${geronimo_version} + car + + + + geronimo-spec + geronimo-spec-j2ee + ${geronimo_spec_j2ee_version} + + + + geronimo + geronimo-activation + ${geronimo_version} + + + geronimo + geronimo-management + ${geronimo_version} + + + geronimo + geronimo-j2ee + ${geronimo_version} + + + geronimo + geronimo-naming + ${geronimo_version} + + + geronimo + geronimo-transaction + ${geronimo_version} + + + geronimo + geronimo-security + ${geronimo_version} + + + geronimo + geronimo-jmxremoting + ${geronimo_version} + + + geronimo + geronimo-jetty + ${geronimo_version} + + + + concurrent + concurrent + ${concurrent_version} + + + tranql + tranql + ${tranql_version} + + + howl + howl-logger + ${howl_version} + + + antlr + antlr + ${antlr_version} + + + regexp + regexp + ${regexp_version} + + + + axis + axis + ${axis_version} + + + + commons-discovery + commons-discovery + ${commons_discovery_version} + + + + Added: geronimo/trunk/configs/ldap-realm/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/src/plan/plan.xml?rev=355668&view=auto ============================================================================== --- geronimo/trunk/configs/ldap-realm/src/plan/plan.xml (added) +++ geronimo/trunk/configs/ldap-realm/src/plan/plan.xml Fri Dec 9 16:47:39 2005 @@ -0,0 +1,65 @@ + + + + + + org.apache.geronimo.security.realm.providers.LDAPLoginModule + true + + initialContextFactory=com.sun.jndi.ldap.LdapCtxFactory + connectionURL=ldap://localhost:1389 + connectionUsername=uid=admin,ou=system + connectionPassword=secret + connectionProtocol= + authentication=simple + userBase=ou=users,ou=system + userSearchMatching=uid={0} + userSearchSubtree=false + roleBase=ou=groups,ou=system + roleName=cn + roleSearchMatching=(uniqueMember={0}) + roleSearchSubtree=false + userRoleName= + + ldap-realm + + + + ldap-realm + + ldap-login + + + geronimo/j2ee-system/${pom.currentVersion}/car + ServerInfo + + + + geronimo/j2ee-security/${pom.currentVersion}/car + JaasLoginService + + + + + REQUIRED + + ldap-login + + + + + ldaptest + ldap-realm + + geronimo/j2ee-security/${pom.currentVersion}/car + JaasLoginService + + + + +