You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2006/08/29 10:24:26 UTC
svn commit: r438005 - in /geronimo/server/branches/1.1/car-maven-plugin:
LICENSE.txt NOTICE.txt pom.xml src/site/apt/usage.apt src/site/site.xml
Author: gnodet
Date: Tue Aug 29 01:24:25 2006
New Revision: 438005
URL: http://svn.apache.org/viewvc?rev=438005&view=rev
Log:
Add missing legal files, fix site, and pom
Added:
geronimo/server/branches/1.1/car-maven-plugin/LICENSE.txt
geronimo/server/branches/1.1/car-maven-plugin/NOTICE.txt
Modified:
geronimo/server/branches/1.1/car-maven-plugin/pom.xml
geronimo/server/branches/1.1/car-maven-plugin/src/site/apt/usage.apt
geronimo/server/branches/1.1/car-maven-plugin/src/site/site.xml
Added: geronimo/server/branches/1.1/car-maven-plugin/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/car-maven-plugin/LICENSE.txt?rev=438005&view=auto
==============================================================================
--- geronimo/server/branches/1.1/car-maven-plugin/LICENSE.txt (added)
+++ geronimo/server/branches/1.1/car-maven-plugin/LICENSE.txt Tue Aug 29 01:24:25 2006
@@ -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/server/branches/1.1/car-maven-plugin/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/car-maven-plugin/NOTICE.txt?rev=438005&view=auto
==============================================================================
--- geronimo/server/branches/1.1/car-maven-plugin/NOTICE.txt (added)
+++ geronimo/server/branches/1.1/car-maven-plugin/NOTICE.txt Tue Aug 29 01:24:25 2006
@@ -0,0 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Modified: geronimo/server/branches/1.1/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/car-maven-plugin/pom.xml?rev=438005&r1=438004&r2=438005&view=diff
==============================================================================
--- geronimo/server/branches/1.1/car-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/1.1/car-maven-plugin/pom.xml Tue Aug 29 01:24:25 2006
@@ -22,9 +22,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>3</version>
+ <groupId>org.apache.geronimo.genesis.config</groupId>
+ <artifactId>project-config</artifactId>
+ <version>1.0</version>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -37,6 +37,11 @@
<geronimo-version>1.1</geronimo-version>
<geronimo-qname-spec-version>1.0.1</geronimo-qname-spec-version>
<maven-version>2.0.4</maven-version>
+ <!--
+ FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+ this snap until 2.2 is released.
+ -->
+ <maven-archiver-version>2.1</maven-archiver-version>
</properties>
<dependencies>
@@ -86,11 +91,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <!--
- FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
- this snap until 2.2 is released.
- -->
- <version>2.2-SNAPSHOT</version>
+ <version>${maven-archiver-version}</version>
</dependency>
<dependency>
@@ -181,12 +182,15 @@
<version>2.1_3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>plugin-support</artifactId>
+ <version>1.0</version>
+ </dependency>
+
</dependencies>
<build>
- <!-- FIXME: Remove when the default is to use the m2 standard layout -->
- <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
-
<resources>
<resource>
<directory>${pom.basedir}</directory>
@@ -211,6 +215,15 @@
</plugin>
</plugins>
</build>
-
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
Modified: geronimo/server/branches/1.1/car-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/car-maven-plugin/src/site/apt/usage.apt?rev=438005&r1=438004&r2=438005&view=diff
==============================================================================
--- geronimo/server/branches/1.1/car-maven-plugin/src/site/apt/usage.apt (original)
+++ geronimo/server/branches/1.1/car-maven-plugin/src/site/apt/usage.apt Tue Aug 29 01:24:25 2006
@@ -71,7 +71,9 @@
</project>
+----------+
-* CAR with ClassPath and MainClass
+* Geronimo Plugin
+
+** POM
+----------+
<project>
@@ -80,6 +82,17 @@
...
<build>
...
+ <resources>
+ ...
+ <resource>
+ <directory>${pom.basedir}/src/resources/META-INF</directory>
+ <includes>
+ <include>geronimo-plugin.xml</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
...
<plugin>
@@ -87,26 +100,12 @@
<artifactId>car-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <classPath>
- <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
- <element>../lib/geronimo-common-${pom.version}.jar</element>
- <element>../lib/geronimo-kernel-${pom.version}.jar</element>
- <element>../lib/geronimo-system-${pom.version}.jar</element>
- <element>../lib/geronimo-util-${pom.version}.jar</element>
- <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
- <element>../lib/concurrent-${concurrentVersion}.jar</element>
- <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
- <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
- <element>../lib/log4j-${log4jVersion}.jar</element>
- <element>../lib/mx4j-${mx4jVersion}.jar</element>
- <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
- <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
- <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
- <element>../lib/xpp3-${xpp3Version}.jar</element>
- <element>../lib/xstream-${xstreamVersion}.jar</element>
- </classPath>
- <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
- <logLevel>DEBUG</logLevel>
+ <deploymentConfigs>
+ <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
+ </deploymentConfigs>
+ <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <planFileName>geronimo-service.xml</planFileName>
+ <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/deployer-service/${pom.version}/deployer-service-${pom.version}.jar</moduleFile>
</configuration>
</plugin>
...
@@ -115,4 +114,91 @@
</build>
...
<project>
++----------+
+
+** src/main/resources/META-INF/geronimo-plugin.xml
+
++----------+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+ <name>ServiceMix deployer</name>
+ <module-id>org.apache.servicemix.geronimo/deployer/${servicemix-version}/car</module-id>
+ <category>Integration</category>
+ <description>This plugin Apache ServiceMix JBI container to Geronimo.</description>
+ <url>http://incubator.apache.org/servicemix</url>
+ <author>The ServiceMix development team</author>
+ <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+ <geronimo-version>1.1</geronimo-version>
+ <dependency>org.apache.servicemix.geronimo/servicemix//car</dependency>
+ <dependency>geronimo/geronimo-gbean-deployer//car</dependency>
+ <dependency>geronimo/j2ee-server//car</dependency>
+ <dependency>geronimo/j2ee-deployer//car</dependency>
+ <obsoletes>org.apache.servicemix.geronimo/deployer//car</obsoletes>
+ <source-repository>http://incubator.apache.org/servicemix/dist/servicemix-3.0-M2-incubating/m2/</source-repository>
+ <source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2/</source-repository>
+ <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+ <source-repository>http://people.apache.org/maven-snapshot-repository/</source-repository>
+ <config-xml-content>
+ <gbean name="ServiceMixConfigBuilder" xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+ </gbean>
+ </config-xml-content>
+</geronimo-plugin>
++----------+
+
+** src/plan/geronimo-service.xml
+
++----------+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+ <environment>
+ <moduleId>
+ <groupId>org.apache.servicemix.geronimo</groupId>
+ <artifactId>deployer</artifactId>
+ <version>${servicemix-version}</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.geronimo</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>${servicemix-version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+
+ <gbean name="ServiceMixConfigBuilder" class="org.apache.servicemix.geronimo.ServiceMixConfigBuilder">
+ <reference name="Repositories" />
+ <xml-attribute name="defaultEnvironment">
+ <environment>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.geronimo</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>${servicemix-version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+</module>
+----------+
Modified: geronimo/server/branches/1.1/car-maven-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/car-maven-plugin/src/site/site.xml?rev=438005&r1=438004&r2=438005&view=diff
==============================================================================
--- geronimo/server/branches/1.1/car-maven-plugin/src/site/site.xml (original)
+++ geronimo/server/branches/1.1/car-maven-plugin/src/site/site.xml Tue Aug 29 01:24:25 2006
@@ -21,7 +21,7 @@
<skin>
<groupId>org.apache.geronimo.genesis.config</groupId>
<artifactId>geronimo-skin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0</version>
</skin>
<publishDate format="dd MMM yyyy"/>
@@ -47,8 +47,6 @@
<menu name="Geronimo">
<item name="Home" href="http://geronimo.apache.org/"/>
</menu>
-
- <menu ref="parent"/>
<menu name="${project.name}">
<item name="Overview" href="index.html"/>