You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2011/12/23 17:10:59 UTC
svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build:
apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/
apache-tomcat/src/main/ apache-tomcat/src/main/assembly/ bootstrap/
tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tom...
Author: olamy
Date: Fri Dec 23 16:10:56 2011
New Revision: 1222717
URL: http://svn.apache.org/viewvc?rev=1222717&view=rev
Log:
start adding maven poms and modules structure
Added:
tomcat/sandbox/trunk-mvn-build/apache-tomcat/
tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/empty/
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/empty/safeToDelete.tmp
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml (with props)
tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml (with props)
tomcat/sandbox/trunk-mvn-build/bootstrap/
tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/
tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-api/
tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/
tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/
tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/
tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/
tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/
tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-logging-juli/
tomcat/sandbox/trunk-mvn-build/tomcat-embed-logging-juli/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-embed-logging-log4j/
tomcat/sandbox/trunk-mvn-build/tomcat-embed-logging-log4j/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-extras-juli-adapters/
tomcat/sandbox/trunk-mvn-build/tomcat-extras-juli-adapters/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-ja/
tomcat/sandbox/trunk-mvn-build/tomcat-i18n-ja/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/
tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-jasper/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/
tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-juli/
tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/
tomcat/sandbox/trunk-mvn-build/tomcat-mail-api/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/
tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-tests/
tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/
tomcat/sandbox/trunk-mvn-build/tomcat-tribes/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-util/
tomcat/sandbox/trunk-mvn-build/tomcat-util/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/docs/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/examples/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/host-manager/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/manager/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/pom.xml (with props)
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/
tomcat/sandbox/trunk-mvn-build/tomcat-webapps/root/pom.xml (with props)
Added: tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+
+ <packaging>pom</packaging>
+
+ <artifactId>apache-tomcat</artifactId>
+ <description>Distribution module</description>
+
+ <properties>
+ <commons-daemon.version>1.0.8</commons-daemon.version>
+ <tomcat-native.version>1.1.22</tomcat-native.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>examples</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>manager</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>docs</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>host-manager</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>root</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-ant</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-ha</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-tribes</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-dbcp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-i18n-es</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-i18n-fr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-i18n-ja</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ <version>${commons-daemon.version}</version>
+ </dependency>
+
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>commons-daemons-native-download</id>
+ <activation>
+ <file>
+ <missing>${basedir}/target/commons-daemon-native.tar.gz</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>http-download-single</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>download-single</goal>
+ </goals>
+ <configuration>
+ <url>http://archive.apache.org/dist/commons/daemon/source</url>
+ <fromFile>commons-daemon-${commons-daemon.version}-src.tar.gz</fromFile>
+ <toFile>./target/commons-daemon-native.tar.gz</toFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tomcat-native-download</id>
+ <activation>
+ <file>
+ <missing>${basedir}/target/tomcat-native.tar.gz</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>http-download-single</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>download-single</goal>
+ </goals>
+ <configuration>
+ <url>http://archive.apache.org/dist/tomcat/tomcat-connectors/native/${tomcat-native.version}/source</url>
+ <fromFile>tomcat-native-${tomcat-native.version}-src.tar.gz</fromFile>
+ <toFile>./target/tomcat-native.tar.gz</toFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-src-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/empty/safeToDelete.tmp
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/empty/safeToDelete.tmp?rev=1222717&view=auto
==============================================================================
(empty)
Added: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,146 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ <format>dir</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>org.apache.tomcat.webapps:examples</exclude>
+ <exclude>org.apache.tomcat.webapps:manager</exclude>
+ <exclude>org.apache.tomcat.webapps:docs</exclude>
+ <exclude>org.apache.tomcat.webapps:host-manager</exclude>
+ <exclude>org.apache.tomcat.webapps:root</exclude>
+ <exclude>org.apache.tomcat:bootstrap</exclude>
+ <exclude>org.apache.ant:ant</exclude>
+ <exclude>org.apache.ant:ant-launcher</exclude>
+ <exclude>org.apache.tomcat:tomcat-juli</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat:bootstrap</include>
+ </includes>
+ <outputFileNameMapping>bootstrap.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat:tomcat-juli</include>
+ <include>commons-daemon:commons-daemon</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat:tomcat-catalina</include>
+ </includes>
+ <outputFileNameMapping>catalina.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>webapps</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:examples</include>
+ <include>org.apache.tomcat.webapps:manager</include>
+ <include>org.apache.tomcat.webapps:docs</include>
+ <include>org.apache.tomcat.webapps:host-manager</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>webapps</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:root</include>
+ </includes>
+ <outputFileNameMapping>ROOT.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/empty</directory>
+ <outputDirectory>logs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/empty</directory>
+ <outputDirectory>temp</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/empty</directory>
+ <outputDirectory>work</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <includes>
+ <include>commons-daemon-native.tar.gz</include>
+ <include>tomcat-native.tar.gz</include>
+ </includes>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,54 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>%regex[(?!((?!target/)[^/]+/)*src/).*target.*]</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.gitattributes</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>DEPENDENCIES</include>
+ <!-- exclude the license and notice as they are not as accurate as the ones below -->
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/apache-tomcat/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>bootstrap</artifactId>
+
+ <description>Tomcat bootstrap jar</description>
+
+ <!--
+ <properties>
+ <tomcat-dbcp.home>${basedir}/target/</tomcat-dbcp.home>
+ </properties>
+ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <!--
+
+ <patternset id="files.bootstrap">
+ <include name="org/apache/catalina/startup/Bootstrap.*" />
+ <include name="org/apache/catalina/startup/catalina.properties" />
+ <include name="org/apache/catalina/startup/CatalinaProperties.*" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory.*" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory$*.*" />
+ <include name="org/apache/catalina/startup/Tool.*" />
+ <include name="org/apache/catalina/loader/StandardClassLoader*.*" />
+ <include name="org/apache/catalina/loader/Extension.*" />
+ <include name="org/apache/catalina/loader/Reloader.*" />
+ <include name="org/apache/catalina/security/SecurityClassLoad.*" />
+ <include name="org/apache/naming/JndiPermission.*" />
+ </patternset>
+
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.tomcat:tomcat-catalina</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>org.apache.tomcat:tomcat-catalina</artifact>
+ <includes>
+ <include>org/apache/catalina/startup/Bootstrap.*</include>
+ <include>org/apache/catalina/startup/catalina.properties</include>
+ <include>org/apache/catalina/startup/CatalinaProperties.*</include>
+ <include>org/apache/catalina/startup/ClassLoaderFactory.*</include>
+ <include>org/apache/catalina/startup/ClassLoaderFactory$*.*</include>
+ <include>org/apache/catalina/startup/Tool.*</include>
+ <include>org/apache/catalina/loader/StandardClassLoader*.*</include>
+ <include>org/apache/catalina/loader/Extension.*</include>
+ <include>org/apache/catalina/loader/Reloader.*</include>
+ <include>org/apache/catalina/security/SecurityClassLoad.*</include>
+ <include>org/apache/naming/JndiPermission.*</include>
+ </includes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <!--
+ <profiles>
+ <profile>
+ <id>import-commons-sources</id>
+ <activation>
+ <file>
+ <missing>${sourceBasePath}/org/apache/tomcat/dbcp</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>unpack-commons-deps</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.6</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**,**/managed/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${tomcat-dbcp.home}/src/java</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>transform_to_tomcat_packages</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+ encoding="ISO-8859-1">
+ <replacefilter token="org.apache.commons"
+ value="org.apache.tomcat.dbcp" />
+ </replace>
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+ encoding="ISO-8859-1">
+ <replacefilter token="enum"
+ value="enumeration" />
+ </replace>
+
+ <mkdir dir="${sourceBasePath}/org/apache/tomcat/dbcp" />
+ <move todir="${sourceBasePath}/org/apache/tomcat/dbcp">
+ <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
+ </move>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ -->
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/bootstrap/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tomcat-annotations-api</artifactId>
+ <packaging>bundle</packaging>
+ <description>Annotations Package</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.tomcat.annotations.api</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Export-Package>
+ javax.*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-annotations-api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tomcat-api</artifactId>
+ <packaging>bundle</packaging>
+ <description>Definition of interfaces shared by Catalina and Jasper</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.tomcat.api</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Export-Package>
+ org.apache.tomcat;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.naming,
+ javax.servlet
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tomcat-catalina-ant</artifactId>
+
+ <description>Tomcat Ant tasks for remote management</description>
+ <dependencies>
+ <!-- TODO move to depMngt in top pom -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/catalina/ant/*" />
+ <include name="org/apache/catalina/ant/jmx/*" />
+ <include name="org/apache/catalina/util/Base64.*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ant/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-catalina-ha</artifactId>
+
+ <description>Tomcat High Availability Implementation</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-tribes</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/catalina/ha/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/catalina/ha/**" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-catalina-jmx-remote</artifactId>
+
+ <description>Tomcat Remote JMX listener</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/catalina/mbeans/JmxRemote*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-jmx-remote/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-catalina-ws</artifactId>
+
+ <description>Tomcat JNDI Factory for Web Services</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jaxrpc</artifactId>
+ <version>1.1-rc4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/naming/factory/webservices/**" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ws/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-catalina</artifactId>
+
+ <description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-mail-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/mbeans-descriptors.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <!--
+ <build>
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/catalina/**/LocalStrings.properties</include>
+ <include>org/apache/naming/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/catalina/**" />
+ <include name="org/apache/naming/**" />
+
+ <exclude name="org/apache/catalina/ant/**" />
+ <exclude name="org/apache/catalina/ha/**" />
+ <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
+ <exclude name="org/apache/catalina/tribes/**" />
+ <exclude name="org/apache/naming/factory/webservices/**" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-coyote</artifactId>
+
+ <description>Tomcat Connectors and HTTP parser</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-i18n-es</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-i18n-fr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-i18n-ja</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/mbeans-descriptors.xml</include>
+ <include>**/LocalStrings.properties</include>
+ <include>**/mbeans-descriptors.dtd</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <!--
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>org/apache/coyote/**/LocalStrings.properties</include>
+ <include>org/apache/util/**/LocalStrings.properties</include>
+ <include>org/apache/catalina/util/CharsetMapperDefault.properties</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/util/file/**</exclude>
+ <exclude>org/apache/util/res/**</exclude>
+ <exclude>org/apache/util/scan/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/coyote/**" />
+ <include name="org/apache/tomcat/jni/**" />
+ <include name="org/apache/jk/**" />
+ <include name="org/apache/tomcat/util/**" />
+ <exclude name="org/apache/tomcat/util/file/**" />
+ <exclude name="org/apache/tomcat/util/res/**" />
+ <exclude name="org/apache/tomcat/util/scan/**" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ -->
+ </build>
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-coyote/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-dbcp</artifactId>
+
+ <description>Tomcat Database Connection Pooling package</description>
+
+ <!--
+ <properties>
+ <tomcat-dbcp.home>${basedir}/target/</tomcat-dbcp.home>
+ </properties>
+ -->
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+ <shadedPattern>org.apache.tomcat.dbcp</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <!--
+ <profiles>
+ <profile>
+ <id>import-commons-sources</id>
+ <activation>
+ <file>
+ <missing>${sourceBasePath}/org/apache/tomcat/dbcp</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>unpack-commons-deps</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.6</version>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>**/*.java</includes>
+ <excludes>**/test/**,**/managed/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${tomcat-dbcp.home}/src/java</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>transform_to_tomcat_packages</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+ encoding="ISO-8859-1">
+ <replacefilter token="org.apache.commons"
+ value="org.apache.tomcat.dbcp" />
+ </replace>
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+ encoding="ISO-8859-1">
+ <replacefilter token="enum"
+ value="enumeration" />
+ </replace>
+
+ <mkdir dir="${sourceBasePath}/org/apache/tomcat/dbcp" />
+ <move todir="${sourceBasePath}/org/apache/tomcat/dbcp">
+ <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
+ </move>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ -->
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-dbcp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <artifactId>tomcat-el-api</artifactId>
+
+ <description>Expression language package</description>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/mbeans-descriptors.xml</include>
+ <include>**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <!--
+ <build>
+ <resources>
+ <resource>
+ <directory>../../java/</directory>
+ <includes>
+ <include>javax/el/**/LocalStrings.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="javax/el/*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+
+ <description>Core Tomcat embed implementation</description>
+
+ <!-- do we really need this jar which is a simple aggregate of some others ?? -->
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-log4j</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- to include in shaded jar -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy_java_files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${sourceBasePath}" includeEmptyDirs="false">
+ <fileset dir="../../java/">
+ <include name="org/apache/coyote/**" />
+ <include name="org/apache/tomcat/jni/**" />
+ <include name="org/apache/tomcat/util/**" />
+ <include name="org/apache/catalina/startup/Bootstrap.*" />
+ <include name="org/apache/catalina/startup/catalina.properties" />
+ <include name="org/apache/catalina/startup/CatalinaProperties.*" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory.*" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory$*.*" />
+ <include name="org/apache/catalina/startup/Tool.*" />
+ <include name="org/apache/catalina/loader/StandardClassLoader*.*" />
+ <include name="org/apache/catalina/loader/Extension.*" />
+ <include name="org/apache/catalina/loader/Reloader.*" />
+ <include name="org/apache/catalina/security/SecurityClassLoad.*" />
+ <include name="org/apache/naming/JndiPermission.*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <!-- TODO exclude some stuff here -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.tomcat:tomcat-mail-api</exclude>
+ <exclude>log4j:log4j</exclude>
+ <exclude>logkit:logkit</exclude>
+ <exclude>avalon-framework:avalon-framework</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-embed-core/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml?rev=1222717&view=auto
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml (added)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml Fri Dec 23 16:10:56 2011
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-parent</artifactId>
+ <version>7.0.24-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+
+ <description>Core Tomcat implementation</description>
+
+ <!-- do we really need this jar which is a simple aggregate of some others ?? -->
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.ant:ant</exclude>
+ <exclude>org.apache.ant:ant-launcher</exclude>
+ <exclude>org.eclipse.jdt.core.compiler:ecj</exclude>
+ <exclude>org.apache.tomcat:tomcat-annotations-api</exclude>
+ <exclude>org.apache.tomcat:tomcat-util</exclude>
+ <exclude>org.apache.tomcat:tomcat-el-api</exclude>
+ <exclude>org.apache.tomcat:tomcat-servlet-api</exclude>
+ <exclude>org.apache.tomcat:tomcat-juli</exclude>
+ <exclude>org.apache.tomcat:tomcat-api</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-mvn-build/tomcat-embed-jasper/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1222717 [1/2] - in /tomcat/sandbox/trunk-mvn-build:
apache-tomcat/ apache-tomcat/src/ apache-tomcat/src/empty/ apache-tomcat/src/main/
apache-tomcat/src/main/assembly/ bootstrap/ tomcat-annotations-api/ tomcat-api/
tomcat-catalina-ant/ tom...
Posted by Mark Thomas <ma...@apache.org>.
On 23/12/2011 16:10, olamy@apache.org wrote:
> Author: olamy
> Date: Fri Dec 23 16:10:56 2011
> New Revision: 1222717
>
> URL: http://svn.apache.org/viewvc?rev=1222717&view=rev
> Log:
> start adding maven poms and modules structure
One thing that does come to mind is that this is a lot of work being
done that might come to nothing. Of course, you are free to scratch your
own itch but I wondered if you thought about looking at the current ant
file Tomcat uses to create the Maven artifacts and seeing if there was
some room for improvement. Clearly, there hasn't been much Maven
expertise around here until recently and improving the current process
may end up being more productive. For example, a fix for [1] that used
the current build process would be very helpful.
Mark
[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=52381
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org