You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2006/09/26 06:03:53 UTC
svn commit: r449892 - in /geronimo/server/trunk: assemblies/
assemblies/geronimo-framework/ assemblies/geronimo-framework/src/
assemblies/geronimo-framework/src/main/
assemblies/geronimo-framework/src/main/assembly/
assemblies/geronimo-framework/src/ma...
Author: jbohn
Date: Mon Sep 25 21:03:51 2006
New Revision: 449892
URL: http://svn.apache.org/viewvc?view=rev&rev=449892
Log:
GERONIMO-2417 Initial commit of Micro-G (geronimo-framework assembly)
Added:
geronimo/server/trunk/assemblies/geronimo-framework/
geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt (with props)
geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt (with props)
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (with props)
geronimo/server/trunk/assemblies/geronimo-framework/src/
geronimo/server/trunk/assemblies/geronimo-framework/src/main/
geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/
geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (with props)
geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/
geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/
geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml (with props)
geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list
geronimo/server/trunk/configs/jetty-deployer/src/main/
geronimo/server/trunk/configs/jetty-deployer/src/main/resources/
geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/
geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml (with props)
geronimo/server/trunk/configs/jetty/src/main/
geronimo/server/trunk/configs/jetty/src/main/resources/
geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/
geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml (with props)
geronimo/server/trunk/configs/tomcat-deployer/src/main/
geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/
geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/
geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml (with props)
geronimo/server/trunk/configs/tomcat/src/main/
geronimo/server/trunk/configs/tomcat/src/main/resources/
geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/
geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml (with props)
Modified:
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/configs/jetty-deployer/pom.xml
geronimo/server/trunk/configs/jetty/pom.xml
geronimo/server/trunk/configs/jetty/src/plan/plan.xml
geronimo/server/trunk/configs/pom.xml
geronimo/server/trunk/configs/tomcat-deployer/pom.xml
geronimo/server/trunk/configs/tomcat/pom.xml
geronimo/server/trunk/configs/tomcat/src/plan/plan.xml
Added: geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt Mon Sep 25 21:03:51 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.
+
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt Mon Sep 25 21:03:51 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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$ $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>
+
+ <parent>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>assemblies</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-framework</artifactId>
+ <name>Geronimo Assemblies :: Minimal Framework</name>
+ <!--
+
+ HACK: See build/resources below...
+
+ <packaging>pom</packaging>
+ -->
+ <packaging>jar</packaging>
+
+ <description>
+ A minimal Geronimo server (Little-G) framework assembly.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>rmi-naming</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>shutdown</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>sharedlib</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>online-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>unavailable-client-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>unavailable-webservices-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>unavailable-ejb-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>hot-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <!--
+ HACK: Because this is a pom packaging and assembly files/file is broke
+ we need to filter with the resources plugin... and must be a jar packaging
+ because for some %^&#ing reason maven-resources-plugin can not
+ be attached!!!!
+ -->
+ <resource>
+ <directory>${pom.basedir}/src/main/var/config</directory>
+ <includes>
+ <include>config.xml</include>
+ <include>offline-deployer-list</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-boilerplate</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate-minimal</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>unpack-schemas</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pre-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <!-- Flatten all schemas -->
+ <mkdir dir="${project.build.directory}/schema"/>
+ <copy todir="${project.build.directory}/schema">
+ <fileset dir="${project.build.directory}/scratch/schema">
+ <include name="**/*.xsd"/>
+ <include name="**/*.dtd"/>
+ </fileset>
+ <mapper type="flatten"/>
+ </copy>
+
+ <!-- Move filtered files -->
+ <move todir="${project.build.directory}/scratch">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="config.xml"/>
+ <include name="offline-deployer-list"/>
+ </fileset>
+ </move>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>installConfig</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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$ $Date$ -->
+
+<assembly>
+ <id>bin</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+
+ <!--
+
+ HACK: Turn off bz2 for now, it takes too long to generate.
+
+ <format>tar.bz2</format>
+ -->
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <dependencySets>
+ <!--
+ NOTE: lib/ is picked up from boilerplate.
+ -->
+
+ <!--
+ NOTE: lib/endorsed/ is picked up from boilerplate.
+ -->
+
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>server.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.geronimo.configs:j2ee-system</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>client.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.geronimo.configs:client-system</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>deployer.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.geronimo.configs:online-deployer</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.geronimo.configs:shutdown</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>upgrade.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.geronimo.configs:upgrade-cli</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/boilerplate</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/archive-tmp/repository</directory>
+ <outputDirectory>repository</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/schema</directory>
+ <outputDirectory>schema</outputDirectory>
+ <includes>
+ <include>**/*.xsd</include>
+ <include>**/*.dtd</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/boilerplate/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/boilerplate/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ <include>*.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/scratch</directory>
+ <outputDirectory>var/config</outputDirectory>
+ <includes>
+ <include>offline-deployer-list</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/scratch</directory>
+ <outputDirectory>var/config</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>config.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ======================================================== -->
+<!-- Warning - This XML file is re-generated by Geronimo when -->
+<!-- changes are made to Geronimo's configuration, therefore -->
+<!-- any comments added to this file will be lost. -->
+<!-- ======================================================== -->
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
+
+ <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+ <gbean name="RMIRegistry">
+ <attribute name="port">${PlanNamingPort}</attribute>
+ </gbean>
+ <gbean name="NamingProperties">
+ <!-- Check whether this really works if host name is 0.0.0.0 -->
+ <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+ </gbean>
+ <gbean name="DownloadedPluginRepos">
+ <attribute name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list-1.2.txt</attribute>
+ <attribute name="userRepositories">[]</attribute>
+ </gbean>
+ </module>
+
+ <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+ <gbean name="JaasLoginServiceRemotingServer">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanRemoteLoginPort}</attribute>
+ </gbean>
+ <gbean name="JMXService">
+ <attribute name="protocol">rmi</attribute>
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanJMXPort}</attribute>
+ <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+ </gbean>
+ </module>
+
+ <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+ <gbean name="WebBuilder">
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
+ </gbean>
+ </module>
+
+ <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+ <gbean name="SharedLib">
+ <attribute name="classesDirs">var/shared/classes</attribute>
+ <attribute name="libDirs">var/shared/lib</attribute>
+ </gbean>
+ </module>
+
+ <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+
+</attributes>
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list (added)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list Mon Sep 25 21:03:51 2006
@@ -0,0 +1,9 @@
+##
+## List of deployers to be started for offline deployment
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+## org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+## org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car
+## org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car
+## org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car
+## org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Mon Sep 25 21:03:51 2006
@@ -64,6 +64,7 @@
<modules>
<module>geronimo-boilerplate-minimal</module>
<module>geronimo-boilerplate-j2ee</module>
+ <module>geronimo-framework</module>
<module>geronimo-jetty-j2ee</module>
<module>geronimo-jetty-minimal</module>
<module>geronimo-tomcat-j2ee</module>
Modified: geronimo/server/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/pom.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/pom.xml Mon Sep 25 21:03:51 2006
@@ -66,4 +66,26 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+ <name>Jetty Deployer</name>
+ <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <category>Core Geronimo</category>
+ <description>The Jetty Deployer for Geronimo. This module includes the Jetty Deployment module so that web applications can be deployed into a Jetty server. This deployment module has a dependency on the Jetty web container.</description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">Apache Software License (ASL) 2.0</license>
+ <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <prerequisite>
+ <id>org.apache.geronimo.configs/jetty//car</id>
+ <resource-type>Web Container</resource-type>
+ <description> This version of the Jetty Deployer requires that the Tomcat web container is present. </description>
+ </prerequisite>
+ <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-jetty-builder//jar</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-deployer//car</dependency>
+ <dependency>org.apache.geronimo.configs/jetty//car</dependency>
+ <obsoletes>org.apache.geronimo.configs/jetty-deployer//car</obsoletes>
+ <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+ <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Mon Sep 25 21:03:51 2006
@@ -70,4 +70,26 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+ <name>Jetty Web Server</name>
+ <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <category>Core Geronimo</category>
+ <description> The Jetty Web Container for Geronimo. This module includes the Jetty Web Container for hosting web applications. It is one of two web servers available for the Geronimo framework. </description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">Apache Software License (ASL) 2.0</license>
+ <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <dependency>org.apache.geronimo.modules/geronimo-jetty//jar</dependency>
+ <dependency>org.apache.geronimo.configs/transaction//car</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-clustering//jar</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
+ <obsoletes>org.apache.geronimo.configs/jetty//car</obsoletes>
+ <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+ <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/src/plan/plan.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty/src/plan/plan.xml Mon Sep 25 21:03:51 2006
@@ -72,7 +72,7 @@
<gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty.connector.AJP13Connector">
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanAJPPort2}</attribute>
+ <attribute name="port">${PlanAJPPort}</attribute>
<reference name="JettyContainer">
<name>JettyWebContainer</name>
</reference>
Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Sep 25 21:03:51 2006
@@ -50,13 +50,11 @@
<jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
<!-- Common plan properties -->
- <PlanServerHostname>localhost</PlanServerHostname>
+ <PlanServerHostname>0.0.0.0</PlanServerHostname>
<PlanClientAddresses>127.0.0.1</PlanClientAddresses>
<PlanHTTPPort>8080</PlanHTTPPort>
<PlanHTTPSPort>8443</PlanHTTPSPort>
- <PlanHTTPPort2>8090</PlanHTTPPort2>
- <PlanHTTPSPort2>8453</PlanHTTPSPort2>
- <PlanAJPPort2>8019</PlanAJPPort2>
+ <PlanAJPPort>8019</PlanAJPPort>
<PlanOpenEJBPort>4201</PlanOpenEJBPort>
<PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
<PlanNamingPort>1099</PlanNamingPort>
Modified: geronimo/server/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/pom.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/pom.xml Mon Sep 25 21:03:51 2006
@@ -67,6 +67,13 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
Added: geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+ <name>Tomcat Deployer</name>
+ <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <category>Core Geronimo</category>
+ <description> The Tomcat Deployer for Geronimo. This module includes the Tomcat Deployment module so that web applications can be deployed into a tomcat server. This deployment module has a dependency on the tomcat web container. </description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">Apache Software License (ASL) 2.0</license>
+ <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <prerequisite>
+ <id>org.apache.geronimo.configs/tomcat//car</id>
+ <resource-type>Web Container</resource-type>
+ <description> This version of the Tomcat Deployer requires that the Tomcat web container is present. </description>
+ </prerequisite>
+ <dependency>org.apache.geronimo.configs/tomcat//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-tomcat-builder//jar</dependency>
+ <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-deployer//car</dependency>
+ <obsoletes>org.apache.geronimo.configs/tomcat-deployer//car</obsoletes>
+ <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+ <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/pom.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat/pom.xml Mon Sep 25 21:03:51 2006
@@ -63,4 +63,26 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=449892
==============================================================================
--- geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Sep 25 21:03:51 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+ <name>Tomcat Web Server</name>
+ <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+ <category>Core Geronimo</category>
+ <description> The Tomcat Web Container for Geronimo. This module includes the Tomcat Web Container for hosting web applications. It is one of two web servers available for the Geronimo framework. </description>
+ <url>http://geronimo.apache.org/</url>
+ <author>The Apache Geronimo development community</author>
+ <license osi-approved="true">Apache Software License (ASL) 2.0</license>
+ <geronimo-version>${pom.currentVersion}</geronimo-version>
+ <dependency>org.apache.geronimo.modules/geronimo-tomcat//jar</dependency>
+ <dependency>org.apache.geronimo.configs/transaction//car</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
+ <obsoletes>org.apache.geronimo.configs/tomcat//car</obsoletes>
+ <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
+ <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+</geronimo-plugin>
Propchange: geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/src/plan/plan.xml?view=diff&rev=449892&r1=449891&r2=449892
==============================================================================
--- geronimo/server/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat/src/plan/plan.xml Mon Sep 25 21:03:51 2006
@@ -52,13 +52,13 @@
<gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
<attribute name="name">HTTP</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPPort2}</attribute>
+ <attribute name="port">${PlanHTTPPort}</attribute>
<attribute name="maxHttpHeaderSizeBytes">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
<attribute name="maxSpareThreads">75</attribute>
<attribute name="hostLookupEnabled">false</attribute>
- <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
<attribute name="acceptQueueSize">100</attribute>
<attribute name="connectionTimeoutMillis">20000</attribute>
<attribute name="uploadTimeoutEnabled">false</attribute>
@@ -71,9 +71,9 @@
<attribute name="protocol">AJP</attribute>
<attribute name="name">AJP</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanAJPPort2}</attribute>
+ <attribute name="port">${PlanAJPPort}</attribute>
<attribute name="hostLookupEnabled">false</attribute>
- <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
<reference name="TomcatContainer">
<name>TomcatWebContainer</name>
</reference>
@@ -85,7 +85,7 @@
<gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.HttpsConnectorGBean">
<attribute name="name">HTTPS</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPSPort2}</attribute>
+ <attribute name="port">${PlanHTTPSPort}</attribute>
<attribute name="maxHttpHeaderSizeBytes">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>