You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/02 01:31:48 UTC
svn commit: r632682 - in /geronimo/plugins/directory/branches/2.0:
directory/pom.xml geronimo-directory-server/
geronimo-directory-server/LICENSE.txt geronimo-directory-server/NOTICE.txt
geronimo-directory-server/pom.xml pom.xml
Author: djencks
Date: Sat Mar 1 16:31:47 2008
New Revision: 632682
URL: http://svn.apache.org/viewvc?rev=632682&view=rev
Log:
add a sample assembly server
Added:
geronimo/plugins/directory/branches/2.0/geronimo-directory-server/
geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt (with props)
geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt (with props)
geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml (with props)
Modified:
geronimo/plugins/directory/branches/2.0/directory/pom.xml
geronimo/plugins/directory/branches/2.0/pom.xml
Modified: geronimo/plugins/directory/branches/2.0/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/directory/pom.xml?rev=632682&r1=632681&r2=632682&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/directory/pom.xml (original)
+++ geronimo/plugins/directory/branches/2.0/directory/pom.xml Sat Mar 1 16:31:47 2008
@@ -142,6 +142,10 @@
<artifactId>shared-ldap</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
</dependency>
@@ -201,6 +205,10 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>antlr</groupId>
Added: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt?rev=632682&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt (added)
+++ geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt Sat Mar 1 16:31:47 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/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt?rev=632682&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt (added)
+++ geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt Sat Mar 1 16:31:47 2008
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml?rev=632682&view=auto
==============================================================================
--- geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml (added)
+++ geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml Sat Mar 1 16:31:47 2008
@@ -0,0 +1,104 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>directory-parent</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <version>2.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-directory-server</artifactId>
+ <packaging>application-assembly</packaging>
+ <version>2.1-SNAPSHOT</version>
+ <name>Sample Geronimo server running Apache Directory</name>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <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>car-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>install-modules</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>archive</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <servers>
+ <serverInstance>
+ <name>default</name>
+ <configFile>var/config/config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>client</name>
+ <attributeManagerFrom>default</attributeManagerFrom>
+ <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ <serverInstance>
+ <name>jsr88</name>
+ <configFile>var/config/jsr88-configurer-config.xml</configFile>
+ <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+ <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+ <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+ </serverInstance>
+ </servers>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate-minimal</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <!-- allow installation of additional modules -->
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>directory</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ <properties>
+ <geronimoVersion>2.1</geronimoVersion>
+ </properties>
+</project>
\ No newline at end of file
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/plugins/directory/branches/2.0/geronimo-directory-server/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/plugins/directory/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/pom.xml?rev=632682&r1=632681&r2=632682&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/pom.xml (original)
+++ geronimo/plugins/directory/branches/2.0/pom.xml Sat Mar 1 16:31:47 2008
@@ -14,11 +14,7 @@
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$ $Date$ -->
-
-<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">
+--><!-- $Rev$ $Date$ --><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>
@@ -260,6 +256,11 @@
<version>0.9.7</version>
</dependency>
<dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ <version>0.9.7</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
<version>0.9.7</version>
@@ -292,6 +293,11 @@
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
<dependency>
<groupId>antlr</groupId>
@@ -494,52 +500,12 @@
</site>
</distributionManagement>
- <profiles>
- <profile>
- <id>default</id>
+ <modules>
+ <module>geronimo-directory</module>
+ <module>directory</module>
+ </modules>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <modules>
- <module>geronimo-directory</module>
- <module>directory</module>
- </modules>
- </profile>
-
- <!--
- NOTE: This profile is used to enable plugin prefixes for easy command-line usage, as in:
-
- mvn -Ptools geronimo:start
- -->
- <profile>
- <id>tools</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>maven-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profiles>
<profile>
<id>makeeclipse</id>