Author: markt
Date: Thu Oct 9 13:28:28 2014
New Revision: 1630440
URL: http://svn.apache.org/r1630440
Log:
Further work on https://issues.apache.org/bugzilla/show_bug.cgi?id=56397
Patch provided by Pierre Viret.
Added:
tomcat/sandbox/trunk-maven-layout/apache-tomcat/ (with props)
tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml (with props)
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
(with props)
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/main/
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/main/resoucres/ (with
props)
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/main/resoucres/logs/
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/main/resoucres/temp/
tomcat/sandbox/trunk-maven-layout/global-resources/
tomcat/sandbox/trunk-maven-layout/global-resources/pom.xml (with props)
tomcat/sandbox/trunk-maven-layout/global-resources/src/
tomcat/sandbox/trunk-maven-layout/global-resources/src/main/
tomcat/sandbox/trunk-maven-layout/global-resources/src/main/resources/
(with props)
tomcat/sandbox/trunk-maven-layout/modules/ (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/src/
tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/src/main/java/javax/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/ (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/pom.xml (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/main/java/org/apache/tomcat/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/main/java/org/apache/catalina/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/main/java/org/apache/catalina/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/main/java/org/apache/catalina/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/pom.xml
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/main/java/org/apache/catalina/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/java/org/apache/naming/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/java/org/apache/naming/factory/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/src/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/src/main/java/org/apache/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/src/
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/src/main/java/org/apache/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/main/java/org/apache/tomcat/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-el-api/src/
tomcat/sandbox/trunk-maven-layout/tomcat-el-api/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-el-api/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-el-api/src/main/java/javax/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/src/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/src/main/java/org/apache/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/java/org/apache/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-jni/src/
tomcat/sandbox/trunk-maven-layout/tomcat-jni/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-jni/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-jni/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-jni/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-jni/src/main/java/org/apache/tomcat/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/src/
tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/src/main/java/javax/
tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/src/main/java/javax/servlet/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/src/
tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/src/main/java/javax/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-spdy/src/
tomcat/sandbox/trunk-maven-layout/tomcat-spdy/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-spdy/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-spdy/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-spdy/src/main/java/org/apache/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/src/
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/src/main/java/org/apache/catalina/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/java/org/apache/tomcat/
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/java/org/apache/tomcat/util/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/ (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/src/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/src/main/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/ (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/src/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/src/conf/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/src/main/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/pom.xml (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/src/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/src/main/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/pom.xml
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/src/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/src/main/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/ (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/pom.xml (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/src/
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/src/main/ (with
props)
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/pom.xml (with props)
tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/src/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/src/main/java/javax/
(with props)
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/org/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/org/apache/
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/org/apache/tomcat/
(with props)
Removed:
tomcat/sandbox/trunk-maven-layout/catalina/pom.xml
Modified:
tomcat/sandbox/trunk-maven-layout/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-el-api/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli-adapters/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-jdbc/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-jni/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-juli/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-servlet-api/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-spdy/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-tribes/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-websocket/pom.xml
Propchange: tomcat/sandbox/trunk-maven-layout/apache-tomcat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+target
Added: tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml?rev=1630440&view=auto
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml (added)
+++ tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml Thu Oct 9 13:28:28
2014
@@ -0,0 +1,270 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>master</artifactId>
+ <version>8.0.13-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apache-tomcat</artifactId>
+ <description>Complete tomcat distribution</description>
+ <packaging>pom</packaging>
+ <url>http://tomcat.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-ant</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-ha</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-storeconfig</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-tribes</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <classifier>bootstrap</classifier>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-dbcp</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-spdy</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util-scan</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>docs</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>examples</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>host-manager</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>manager</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>ROOT</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ <classifier>native-src</classifier>
+ <type>tar.gz</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <filters>
+
<filter>${project.build.directory}/filters/build.properties.default</filter>
+ </filters>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <targetPath>${tomcat.distrib.base}</targetPath>
+ <excludes>
+ <exclude>conf/tomcat-users.xsd</exclude>
+ </excludes>
+ </resource>
+ <resource>
+
<directory>${project.build.directory}/generated-resources</directory>
+ <filtering>true</filtering>
+ <targetPath>${tomcat.distrib.base}</targetPath>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-global-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>global-resources</artifactId>
+
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+
<includes>NOTICE,LICENSE,RELEASE-NOTES,RUNNING.txt</includes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>global-resources</artifactId>
+
<outputDirectory>${project.build.directory}/filters</outputDirectory>
+
<includes>build.properties.default</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-distrib-resources</id>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distribs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/assembly/distrib.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+
<tomcat.distrib.base>${project.build.directory}/distrib</tomcat.distrib.base>
+ </properties>
+</project>
Propchange: tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml?rev=1630440&view=auto
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
(added)
+++ tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
Thu Oct 9 13:28:28 2014
@@ -0,0 +1,225 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+ <id>distrib</id>
+ <formats>
+ <!--
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ -->
+ <format>dir</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${tomcat.distrib.base}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>bin/*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${tomcat.distrib.base}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <!-- first get all libs whether name equals artifact's name -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-api:jar</include>
+ <include>org.apache.tomcat:tomcat-coyote:jar</include>
+ <include>org.apache.tomcat:tomcat-api:jar</include>
+ <include>org.apache.tomcat:tomcat-dbcp:jar</include>
+ <include>org.apache.tomcat:tomcat-jdbc:jar</include>
+ <include>org.apache.tomcat:tomcat-jni:jar</include>
+ <include>org.apache.tomcat:tomcat-spdy:jar</include>
+ <include>org.apache.tomcat:tomcat-util-scan:jar</include>
+ <include>org.apache.tomcat:tomcat-util:jar</include>
+ <include>org.apache.tomcat:tomcat-websocket:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <!-- now get all libs whether name differs from artifact's name... -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>annotations-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-annotations-api:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>catalina-ant.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-catalina-ant:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>catalina-ha.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-catalina-ha:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+
<outputFileNameMapping>catalina-storeconfig.jar</outputFileNameMapping>
+ <includes>
+
<include>org.apache.tomcat:tomcat-catalina-storeconfig:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>catalina-tribes.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-tribes:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>catalina.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-catalina:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>el-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-el-api:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jasper-el.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-jasper-el:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jasper.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-jasper:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jsp-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-jsp-api:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>servlet-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-servlet-api:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>websocket-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.apache.tomcat:tomcat-websocket-api:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <!-- ecj has version number in name... -->
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.eclipse.jdt.core.compiler:ecj:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <!-- webapps -->
+ <dependencySet>
+ <outputDirectory>webapps/docs</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:docs</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>webapps/examples</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:examples</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>webapps/host-manager</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:host-manager</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>webapps/manager</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:manager</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>webapps/ROOT</outputDirectory>
+ <includes>
+ <include>org.apache.tomcat.webapps:ROOT</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <!-- populate bin directory -->
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>bootstrap.jar</outputFileNameMapping>
+ <includes>
+
<include>org.apache.tomcat:tomcat-catalina:jar:bootstrap</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>commons-daemon:commons-daemon:jar</include>
+ <include>org.apache.tomcat:tomcat-juli:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}-native.${artifact.extension}</outputFileNameMapping>
+ <includes>
+
<include>commons-daemon:commons-daemon:tar.gz:native-src</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange:
tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/assembly/distrib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/trunk-maven-layout/apache-tomcat/src/main/resoucres/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1,2 @@
+^/tomcat/trunk/bin bin
+^/tomcat/trunk/conf conf
Added: tomcat/sandbox/trunk-maven-layout/global-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/global-resources/pom.xml?rev=1630440&view=auto
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/global-resources/pom.xml (added)
+++ tomcat/sandbox/trunk-maven-layout/global-resources/pom.xml Thu Oct 9
13:28:28 2014
@@ -0,0 +1,30 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>master</artifactId>
+ <version>8.0.13-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>global-resources</artifactId>
+ <description>Global resources needed for tomcat build</description>
+ <url>http://tomcat.apache.org</url>
+</project>
Propchange: tomcat/sandbox/trunk-maven-layout/global-resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/trunk-maven-layout/global-resources/src/main/resources/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1,5 @@
+^/tomcat/trunk/LICENSE LICENSE
+^/tomcat/trunk/NOTICE NOTICE
+^/tomcat/trunk/RELEASE-NOTES RELEASE-NOTES
+^/tomcat/trunk/RUNNING.txt RUNNING.txt
+^/tomcat/trunk/build.properties.default build.properties.default
Propchange: tomcat/sandbox/trunk-maven-layout/modules/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/modules/jdbc-pool jdbc-pool
Modified: tomcat/sandbox/trunk-maven-layout/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/pom.xml Thu Oct 9 13:28:28 2014
@@ -1,4 +1,3 @@
-<?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
@@ -50,7 +49,6 @@
<module>tomcat-extras-juli-adapters</module>
<module>tomcat-jasper</module>
<module>tomcat-jasper-el</module>
- <module>tomcat-jdbc</module>
<module>tomcat-jni</module>
<module>tomcat-jsp-api</module>
<module>tomcat-servlet-api</module>
@@ -62,20 +60,99 @@
<module>tomcat-websocket</module>
<module>tomcat-websocket-api</module>
<module>tomcat-mail-api</module>
+ <module>apache-tomcat</module>
+ <!--
+ <module>tomcat-i18n-es</module>
+ <module>tomcat-i18n-fr</module>
+ <module>tomcat-i18n-ja</module>
+ -->
+ <!-- seperate modules -->
+ <!-- disabled because maven build is broken with java 8 & javadoc
problems
+ see https://issues.apache.org/bugzilla/show_bug.cgi?id=57005
+ <module>modules/jdbc-pool</module>
+ -->
+ <module>tomcat-buildutil</module>
+ <module>tomcat-webapps</module>
+ <module>global-resources</module>
+ <module>tomcat-catalina-storeconfig</module>
</modules>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<pluginManagement>
<!-- The version for all plugins used by the modules must be
defined here -->
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${tomcat.jdk.source}</source>
+ <target>${tomcat.jdk.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!-- original default.manifest used by ant build:
+ Manifest-Version: 1.0
+ Specification-Title: Apache Tomcat
+ Specification-Version: @VERSION_MAJOR_MINOR@
+ Specification-Vendor: Apache Software Foundation
+ Implementation-Title: Apache Tomcat
+ Implementation-Version: @VERSION@
+ Implementation-Vendor: Apache Software Foundation
+ X-Compile-Source-JDK: @source.jdk@
+ X-Compile-Target-JDK: @target.jdk@
+ -->
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+
<X-Compile-Source-JDK>${tomcat.jdk.source}</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>${tomcat.jdk.target}</X-Compile-Target-JDK>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -103,9 +180,37 @@
<artifactId>ant</artifactId>
<version>1.9.4</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ <version>1.0.15</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ <classifier>native-src</classifier>
+ <type>tar.gz</type>
+ <version>1.0.15</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>global-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -161,6 +266,28 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <classifier>bootstrap</classifier>
+ <scope>runtime</scope>
+ <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-catalina-storeconfig</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -171,35 +298,111 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-websocket-api</artifactId>
+ <artifactId>tomcat-jasper</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-jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-spdy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-buildutil</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-mail-api</artifactId>
<scope>provided</scope>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>docs</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>examples</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>host-manager</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>manager</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.webapps</groupId>
+ <artifactId>ROOT</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat.extras</groupId>
<artifactId>tomcat-extras-juli</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
<properties>
<tomcat.base.dir>/Users/viretp/Dev/apache/tomcat/trunk</tomcat.base.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomcat.jdk.source>1.7</tomcat.jdk.source>
+ <tomcat.jdk.target>1.7</tomcat.jdk.target>
+
+ <!-- define properties for the resource filter -->
+ <version.major>8</version.major>
+ <version.minor>0</version.minor>
+ <version.build>13</version.build>
+ <version.patch>0</version.patch>
+ <version.suffix>-SNAPSHOT</version.suffix>
+
<version>${version.major}.${version.minor}.${version.build}${version.suffix}</version>
+
<version.number>${version.major}.${version.minor}.${version.build}.${version.patch}</version.number>
+
<version.major.minor>${version.major}.${version.minor}</version.major.minor>
+ <maven.build.timestamp.format>MMM d yyyy
hh:mm:ss</maven.build.timestamp.format>
+ <YEAR>2014</YEAR>
+ <VERSION>${version}</VERSION>
+ <VERSION_NUMBER>${version.number}</VERSION_NUMBER>
+ <VERSION_MAJOR>${version.major}</VERSION_MAJOR>
+ <VERSION_MAJOR_MINOR>${version.major.minor}</VERSION_MAJOR_MINOR>
+ <VERSION_BUILT>${maven.build.timestamp}</VERSION_BUILT>
+ <JDT_VERSION>4.4</JDT_VERSION>
</properties>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/pom.xml Thu Oct 9
13:28:28 2014
@@ -25,10 +25,6 @@
</parent>
<artifactId>tomcat-annotations-api</artifactId>
-
- <description>Annotations Package</description>
- <url>http://tomcat.apache.org/</url>
-
-
-
+ <description>Annotations Package</description>
+ <url>http://tomcat.apache.org</url>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-annotations-api/src/main/java/javax/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1,4 @@
+^/tomcat/trunk/java/javax/annotation annotation
+^/tomcat/trunk/java/javax/ejb ejb
+^/tomcat/trunk/java/javax/persistence persistence
+^/tomcat/trunk/java/javax/xml/ws xml/ws
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+target
Added: tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/pom.xml?rev=1630440&view=auto
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/pom.xml (added)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/pom.xml Thu Oct 9
13:28:28 2014
@@ -0,0 +1,41 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>master</artifactId>
+ <version>8.0.13-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tomcat-buildutil</artifactId>
+ <description>Tomcat Build Utilities</description>
+ <url>http://tomcat.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-buildutil/src/main/java/org/apache/tomcat/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/tomcat/buildutil buildutil
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/pom.xml Thu Oct 9
13:28:28 2014
@@ -29,15 +29,23 @@
<description>Tomcat Ant tasks for remote management</description>
<url>http://tomcat.apache.org/</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util-scan</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util-scan</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ </dependencies>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ant/src/main/java/org/apache/catalina/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/catalina/ant ant
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/pom.xml Thu Oct 9
13:28:28 2014
@@ -27,36 +27,37 @@
<artifactId>tomcat-catalina-ha</artifactId>
<description>Tomcat High Availability Implementation</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-tribes</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util-scan</artifactId>
- </dependency>
- </dependencies>
+ <url>http://tomcat.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-tribes</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util-scan</artifactId>
+ </dependency>
+ </dependencies>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ha/src/main/java/org/apache/catalina/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/catalina/ha ha
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/pom.xml
(original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/pom.xml Thu
Oct 9 13:28:28 2014
@@ -29,19 +29,19 @@
<description>Tomcat Remote JMX listener</description>
<url>http://tomcat.apache.org/</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ </dependencies>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-jmx-remote/src/main/java/org/apache/catalina/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
mbeans/JmxRemoteLifecycleListener.java
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+target
Added: tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/pom.xml?rev=1630440&view=auto
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/pom.xml
(added)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/pom.xml Thu
Oct 9 13:28:28 2014
@@ -0,0 +1,39 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>master</artifactId>
+ <version>8.0.13-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tomcat-catalina-storeconfig</artifactId>
+
+ <description>Tomcat catalina storeconfig</description>
+ <url>http://tomcat.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina-ha</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-storeconfig/src/main/java/org/apache/catalina/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/catalina/storeconfig storeconfig
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/pom.xml Thu Oct 9
13:28:28 2014
@@ -27,6 +27,7 @@
<artifactId>tomcat-catalina-ws</artifactId>
<description>Tomcat JNDI Factory for Web Services</description>
+ <url>http://tomcat.apache.org</url>
<dependencies>
<dependency>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina-ws/src/main/java/org/apache/naming/factory/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/naming/factory/webservices webservices
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-catalina/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-catalina/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-catalina/pom.xml Thu Oct 9
13:28:28 2014
@@ -26,8 +26,7 @@
<artifactId>tomcat-catalina</artifactId>
<description>Tomcat Servlet Engine Core Classes and Standard
implementations</description>
-
- <url>http://tomcat.apache.org/</url>
+ <url>http://tomcat.apache.org</url>
<dependencies>
<dependency>
@@ -75,5 +74,48 @@
<artifactId>geronimo-spec-jaxrpc</artifactId>
</dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/catalina/ant/**</exclude>
+ <exclude>org/apache/catalina/ha/**</exclude>
+
<exclude>org/apache/catalina/mbeans/JmxRemote*</exclude>
+ <exclude>org/apache/catalina/tribes/**</exclude>
+ <exclude>org/apache/catalina/storeconfig/**</exclude>
+
<exclude>org/apache/naming/factory/webservices/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-bootstrap</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>bootstrap</classifier>
+ <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/security/SecurityClassLoad.*</include>
+
<include>org/apache/naming/JndiPermission.*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-catalina/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1,2 @@
+^/tomcat/trunk/java/org/apache/catalina catalina
+^/tomcat/trunk/java/org/apache/naming naming
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-coyote/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-coyote/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-coyote/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-coyote/pom.xml Thu Oct 9 13:28:28
2014
@@ -24,30 +24,47 @@
<version>8.0.13-SNAPSHOT</version>
</parent>
- <artifactId>tomcat-coyote</artifactId>
- <description>Tomcat Connectors and HTTP parser</description>
+ <artifactId>tomcat-coyote</artifactId>
+ <description>Tomcat Connectors and HTTP parser</description>
+ <url>http://tomcat.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jni</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util-scan</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util-scan</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/coyote/spdy/**</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>org/apache/coyote/spdy/**</testExclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-coyote/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1,7 @@
+^/tomcat/trunk/java/org/apache/coyote coyote
+^/tomcat/trunk/java/org/apache/tomcat/util/bcel tomcat/util/bcel
+^/tomcat/trunk/java/org/apache/tomcat/util/collections tomcat/util/collections
+^/tomcat/trunk/java/org/apache/tomcat/util/http tomcat/util/http
+^/tomcat/trunk/java/org/apache/tomcat/util/log tomcat/util/log
+^/tomcat/trunk/java/org/apache/tomcat/util/modeler tomcat/util/modeler
+^/tomcat/trunk/java/org/apache/tomcat/util/net tomcat/util/net
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/pom.xml Thu Oct 9 13:28:28
2014
@@ -24,15 +24,16 @@
<version>8.0.13-SNAPSHOT</version>
</parent>
- <artifactId>tomcat-dbcp</artifactId>
- <description>Tomcat Database Connection Pooling package</description>
+ <artifactId>tomcat-dbcp</artifactId>
+ <description>Tomcat Database Connection Pooling package</description>
+ <url>http://tomcat.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ </dependencies>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-dbcp/src/main/java/org/apache/tomcat/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/tomcat/dbcp dbcp
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-el-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-el-api/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-el-api/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-el-api/pom.xml Thu Oct 9 13:28:28
2014
@@ -24,7 +24,7 @@
<version>8.0.13-SNAPSHOT</version>
</parent>
- <artifactId>tomcat-el-api</artifactId>
- <description>Expression language package</description>
-
+ <artifactId>tomcat-el-api</artifactId>
+ <description>Expression language package</description>
+ <url>http://tomcat.apache.org</url>
</project>
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-el-api/src/main/java/javax/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/javax/el el
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli-adapters/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli-adapters/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli-adapters/pom.xml
(original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli-adapters/pom.xml Thu
Oct 9 13:28:28 2014
@@ -27,17 +27,79 @@
<groupId>org.apache.tomcat.extras</groupId>
<artifactId>tomcat-extras-juli-adapters</artifactId>
<description>Adapters to plug in other logging frameworks in
Tomcat</description>
+ <url>http://tomcat.apache.org</url>
<dependencies>
<dependency>
- <groupId>org.apache.tomcat.extras</groupId>
- <artifactId>tomcat-extras-juli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <optional>true</optional>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-global-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>global-resources</artifactId>
+
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <includes>NOTICE,LICENSE</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>commons-logging:commons-logging</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+
<artifact>commons-logging:commons-logging</artifact>
+ <includes>
+
<include>org/apache/commons/logging/impl/*</include>
+ </includes>
+ <excludes>
+
<exclude>org/apache/commons/logging/impl/WeakHashtable*</exclude>
+
<exclude>org/apache/juli/logging/impl/LogFactoryImpl*</exclude>
+ <exclude>**/package.html</exclude>
+ <exclude>**/LocalStrings_*</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+
<shadedPattern>org.apache.juli</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-extras-juli/pom.xml Thu Oct 9
13:28:28 2014
@@ -27,5 +27,95 @@
<groupId>org.apache.tomcat.extras</groupId>
<artifactId>tomcat-extras-juli</artifactId>
<description>Replacement for Tomcat Core Logging Package</description>
+ <url>http://tomcat.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-global-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>global-resources</artifactId>
+
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <includes>NOTICE,LICENSE</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>commons-logging:commons-logging</include>
+
<include>org.apache.tomcat:tomcat-juli</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+
<artifact>commons-logging:commons-logging</artifact>
+ <includes>
+
<include>org/apache/commons/logging/*</include>
+
<include>org/apache/commons/logging/impl/LogFactoryImpl*</include>
+
<include>org/apache/commons/logging/impl/WeakHashtable*</include>
+
<include>org/apache/commons/logging/impl/SimpleLog*</include>
+
<include>org/apache/commons/logging/impl/NoOpLog*</include>
+
<include>org/apache/commons/logging/impl/Jdk14Logger</include>
+ </includes>
+ <excludes>
+ <exclude>**/package.html</exclude>
+ <exclude>**/LocalStrings_*</exclude>
+ </excludes>
+ </filter>
+ <filter>
+
<artifact>org.apache.tomcat:tomcat-juli</artifact>
+ <excludes>
+ <exclude>**/package.html</exclude>
+ <exclude>**/LocalStrings_*</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+
<shadedPattern>org.apache.juli</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/pom.xml Thu Oct 9
13:28:28 2014
@@ -24,14 +24,15 @@
<version>8.0.13-SNAPSHOT</version>
</parent>
- <artifactId>tomcat-jasper-el</artifactId>
- <description>Jasper Expression Language Impl</description>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <description>Jasper Expression Language Impl</description>
+ <url>http://tomcat.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ </dependency>
+ </dependencies>
</project>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-jasper-el/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/el el
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-jasper/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-jasper/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-jasper/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-jasper/pom.xml Thu Oct 9 13:28:28
2014
@@ -26,7 +26,8 @@
<artifactId>tomcat-jasper</artifactId>
<description>Tomcats JSP Parser</description>
-
+ <url>http://tomcat.apache.org</url>
+
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
Propchange:
tomcat/sandbox/trunk-maven-layout/tomcat-jasper/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Oct 9 13:28:28 2014
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/jasper jasper
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-jdbc/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-jdbc/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-jdbc/pom.xml Thu Oct 9 13:28:28
2014
@@ -24,15 +24,16 @@
<version>8.0.13-SNAPSHOT</version>
</parent>
- <artifactId>tomcat-jdbc</artifactId>
- <description>Tomcat JDBC Pool Package</description>
+ <artifactId>tomcat-jdbc</artifactId>
+ <description>Tomcat JDBC Pool Package</description>
+ <url>http://tomcat.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ </dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
