Modified: tomcat/sandbox/trunk-maven-layout/tomcat-jni/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-jni/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-jni/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-jni/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,7 +24,7 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-jni</artifactId> - <description>Interface code to the native connector</description> - + <artifactId>tomcat-jni</artifactId> + <description>Interface code to the native connector</description> + <url>http://tomcat.apache.org</url> </project>
Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-jni/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/jni jni Modified: tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,19 +24,20 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-jsp-api</artifactId> - <description>JSP package</description> + <artifactId>tomcat-jsp-api</artifactId> + <description>JSP package</description> + <url>http://tomcat.apache.org</url> - <dependencies> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-el-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + </dependency> + </dependencies> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-jsp-api/src/main/java/javax/servlet/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/java/javax/servlet/jsp jsp Modified: tomcat/sandbox/trunk-maven-layout/tomcat-juli/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-juli/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-juli/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-juli/pom.xml Thu Oct 9 13:28:28 2014 @@ -27,13 +27,12 @@ <artifactId>tomcat-juli</artifactId> <description>Tomcat Core Logging Package</description> - <url>http://tomcat.apache.org/</url> + <url>http://tomcat.apache.org</url> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> </dependency> </dependencies> Modified: tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/pom.xml Thu Oct 9 13:28:28 2014 @@ -26,5 +26,5 @@ <artifactId>tomcat-mail-api</artifactId> <description>Mail Package</description> - + <url>http://tomcat.apache.org</url> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-mail-api/src/main/java/javax/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/java/javax/mail mail Modified: tomcat/sandbox/trunk-maven-layout/tomcat-servlet-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-servlet-api/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-servlet-api/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-servlet-api/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,69 +24,70 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-servlet-api</artifactId> - <description>javax.servlet package</description> + <artifactId>tomcat-servlet-api</artifactId> + <description>javax.servlet package</description> + <url>http://tomcat.apache.org</url> + + <licenses> + <license> + <name> + Apache License, Version 2.0 and + Common Development And Distribution License (CDDL) Version 1.0 + </name> + <url> + http://www.apache.org/licenses/LICENSE-2.0.txt and + http://www.opensource.org/licenses/cddl1.txt + </url> + <distribution>repo</distribution> + <comments> + The Apache License, version 2.0 applies to all files apart from + javaee_5.xsd, + javaee_6.xsd, + javaee_7.xsd, + javaee_web_services_1_2.xsd, + javaee_web_services_client_1_2.xsd, + javaee_web_services_1_3.xsd, + javaee_web_services_client_1_3.xsd, + javaee_web_services_1_4.xsd, + javaee_web_services_client_1_4.xsd, + jsp_2_2.xsd, + jsp_2_3.xsd, + web-app_3_0.xsd, + web-common_3_0.xsd, + web-fragment_3_0.xsd, + web-app_3_1.xsd, + web-common_3_1.xsd and + web-fragment_3_1.xsd + to which the CDDL version 1.0 applies. + </comments> + </license> + </licenses> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>javax/servlet/jsp/**</exclude> + </excludes> + <!-- Skip the tests as there are circular dependencies --> + <testExcludes> + <testExclude>javax/servlet/**</testExclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> - <licenses> - <license> - <name> - Apache License, Version 2.0 and - Common Development And Distribution License (CDDL) Version 1.0 - </name> - <url> - http://www.apache.org/licenses/LICENSE-2.0.txt and - http://www.opensource.org/licenses/cddl1.txt - </url> - <distribution>repo</distribution> - <comments> - The Apache License, version 2.0 applies to all files apart from - javaee_5.xsd, - javaee_6.xsd, - javaee_7.xsd, - javaee_web_services_1_2.xsd, - javaee_web_services_client_1_2.xsd, - javaee_web_services_1_3.xsd, - javaee_web_services_client_1_3.xsd, - javaee_web_services_1_4.xsd, - javaee_web_services_client_1_4.xsd, - jsp_2_2.xsd, - jsp_2_3.xsd, - web-app_3_0.xsd, - web-common_3_0.xsd, - web-fragment_3_0.xsd, - web-app_3_1.xsd, - web-common_3_1.xsd and - web-fragment_3_1.xsd - to which the CDDL version 1.0 applies. - </comments> - </license> - </licenses> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <excludes> - <exclude>javax/servlet/jsp/**</exclude> - </excludes> - <!-- Skip the tests as there are circular dependencies --> - <testExcludes> - <testExclude>javax/servlet/**</testExclude> - </testExcludes> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> + </dependencies> </project> Modified: tomcat/sandbox/trunk-maven-layout/tomcat-spdy/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-spdy/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-spdy/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-spdy/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,30 +24,31 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-spdy</artifactId> - <description>SPDY implementation</description> + <artifactId>tomcat-spdy</artifactId> + <description>SPDY implementation</description> + <url>http://tomcat.apache.org</url> - <dependencies> - <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-coyote</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - </dependency> - </dependencies> + <dependencies> + <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-coyote</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + </dependency> + </dependencies> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-spdy/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/coyote/spdy coyote/spdy +^/tomcat/trunk/java/org/apache/tomcat/spdy tomcat/spdy Modified: tomcat/sandbox/trunk-maven-layout/tomcat-tribes/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-tribes/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-tribes/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-tribes/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,14 +24,15 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-tribes</artifactId> - <description>Tomcat Group Communication Package</description> + <artifactId>tomcat-tribes</artifactId> + <description>Tomcat Group Communication 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-tribes/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/tribes tribes Modified: tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,30 +24,31 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-util-scan</artifactId> - <description> - Common code shared by Catalina and Jasper for scanning JARS and processing - XML descriptors - </description> + <artifactId>tomcat-util-scan</artifactId> + <description> + Common code shared by Catalina and Jasper for scanning JARS and processing + XML descriptors + </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-juli</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jsp-api</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + </dependency> + </dependencies> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-util-scan/src/main/java/org/apache/tomcat/util/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1,4 @@ +^/tomcat/trunk/java/org/apache/tomcat/util/descriptor descriptor +^/tomcat/trunk/java/org/apache/tomcat/util/digester digester +^/tomcat/trunk/java/org/apache/tomcat/util/file file +^/tomcat/trunk/java/org/apache/tomcat/util/scan scan Modified: tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-util/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,54 +24,54 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-util</artifactId> - <description>Common code shared by multiple Tomcat components</description> + <artifactId>tomcat-util</artifactId> + <description>Common code shared by multiple Tomcat components</description> + <url>http://tomcat.apache.org</url> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/apache/tomcat/util/bcel/**</exclude> + <exclude>org/apache/tomcat/util/collections/**</exclude> + <exclude>org/apache/tomcat/util/descriptor/**</exclude> + <exclude>org/apache/tomcat/util/digester/**</exclude> + <exclude>org/apache/tomcat/util/http/**</exclude> + <exclude>org/apache/tomcat/util/log/**</exclude> + <exclude>org/apache/tomcat/util/modeler/**</exclude> + <exclude>org/apache/tomcat/util/net/**</exclude> + <exclude>org/apache/tomcat/util/scan/**</exclude> + </excludes> + <testExcludes> + <testExclude>org/apache/tomcat/util/bcel/**</testExclude> + <testExclude>org/apache/tomcat/util/collections/**</testExclude> + <testExclude>org/apache/tomcat/util/descriptor/**</testExclude> + <testExclude>org/apache/tomcat/util/digester/**</testExclude> + <testExclude>org/apache/tomcat/util/http/**</testExclude> + <testExclude>org/apache/tomcat/util/log/**</testExclude> + <testExclude>org/apache/tomcat/util/modeler/**</testExclude> + <testExclude>org/apache/tomcat/util/net/**</testExclude> + <testExclude>org/apache/tomcat/util/scan/**</testExclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/apache/tomcat/util/bcel/**</exclude> - <exclude>org/apache/tomcat/util/collections/**</exclude> - <exclude>org/apache/tomcat/util/descriptor/**</exclude> - <exclude>org/apache/tomcat/util/digester/**</exclude> - <exclude>org/apache/tomcat/util/http/**</exclude> - <exclude>org/apache/tomcat/util/log/**</exclude> - <exclude>org/apache/tomcat/util/modeler/**</exclude> - <exclude>org/apache/tomcat/util/net/**</exclude> - <exclude>org/apache/tomcat/util/scan/**</exclude> - </excludes> - <testExcludes> - <testExclude>org/apache/tomcat/util/bcel/**</testExclude> - <testExclude>org/apache/tomcat/util/collections/**</testExclude> - <testExclude>org/apache/tomcat/util/descriptor/**</testExclude> - <testExclude>org/apache/tomcat/util/digester/**</testExclude> - <testExclude>org/apache/tomcat/util/http/**</testExclude> - <testExclude>org/apache/tomcat/util/log/**</testExclude> - <testExclude>org/apache/tomcat/util/modeler/**</testExclude> - <testExclude>org/apache/tomcat/util/net/**</testExclude> - <testExclude>org/apache/tomcat/util/scan/**</testExclude> - </testExcludes> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> + </dependencies> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +target Added: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml?rev=1630440&view=auto ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml (added) +++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml Thu Oct 9 13:28:28 2014 @@ -0,0 +1,67 @@ +<?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.webapps</groupId> + <artifactId>tomcat-webapps</artifactId> + <version>8.0.13-SNAPSHOT</version> + </parent> + + <artifactId>ROOT</artifactId> + <description>Tomcat ROOT webapp</description> + <packaging>war</packaging> + + <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> + <includes>RELEASE-NOTES</includes> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/generated-resources</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>${project.build.directory}/generated-resources</directory> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> +</project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/src/main/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/webapps/ROOT webapp Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +target Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/src/conf/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/conf/catalina.policy catalina.policy Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/src/main/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/webapps/docs webapp Added: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/pom.xml?rev=1630440&view=auto ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/pom.xml (added) +++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/pom.xml Thu Oct 9 13:28:28 2014 @@ -0,0 +1,238 @@ +<?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.webapps</groupId> + <artifactId>tomcat-webapps</artifactId> + <version>8.0.13-SNAPSHOT</version> + </parent> + + <artifactId>examples</artifactId> + <description>Tomcat Examples</description> + <packaging>war</packaging> + <url>http://tomcat.apache.org</url> + + <build> + <sourceDirectory>src/main/webapp/WEB-INF/classes</sourceDirectory> + <resources> + <!-- keep the sources by the classes --> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + <!-- copy the whole structure into additional dir --> + <resource> + <directory>src/main/webapp</directory> + <filtering>false</filtering> + <targetPath>${additional.files}</targetPath> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <includeEmptyDirs>true</includeEmptyDirs> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>txt2html</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="compile_classpath" refid="maven.compile.classpath"/> + <!-- copied from trunk/build.xml --> + <taskdef name="txt2html" + classname="org.apache.tomcat.buildutil.Txt2Html" + classpath="${compile_classpath}" /> + + <txt2html todir="${additional.files}/jsp/jsp2/simpletag"> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples"> + <include name="BookBean.java"/> + </fileset> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples/simpletag"> + <include name="FindBookSimpleTag.java"/> + <include name="RepeatSimpleTag.java"/> + <include name="HelloWorldSimpleTag.java"/> + </fileset> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples/el"> + <include name="Functions.java"/> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}/jsp/jsp2/jspattribute"> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples"> + <include name="FooBean.java"/> + </fileset> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples/simpletag"> + <include name="ShuffleSimpleTag.java"/> + <include name="TileSimpleTag.java"/> + <include name="HelloWorldSimpleTag.java"/> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}/jsp/cal"> + <fileset dir="${project.build.sourceDirectory}/cal"> + <include name="Entries.java"/> + <include name="Entry.java"/> + <include name="JspCalendar.java"/> + <include name="TableBean.java"/> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}/jsp/jsptoserv"> + <fileset dir="${project.build.sourceDirectory}"> + <include name="ServletToJsp.java"/> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}/jsp/jsp2/el"> + <fileset dir="${project.build.sourceDirectory}/examples"> + <include name="ValuesTag.java"/> + </fileset> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples"> + <include name="ValuesBean.java"/> + </fileset> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples/el"> + <include name="Functions.java"/> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}/jsp/jsp2/misc"> + <fileset dir="${project.build.sourceDirectory}/jsp2/examples/simpletag"> + <include name="EchoAttributesTag.java"/> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}/jsp/jsp2/tagfiles"> + <fileset dir="src/main/webapp/WEB-INF/tags"> + <include name="**/*.tag" /> + </fileset> + </txt2html> + + <txt2html todir="${additional.files}"> + <fileset dir="src/main/webapp"> + <include name="**/*.jsp" /> + <include name="**/*.jspx" /> + <include name="**/*.jspf" /> + <exclude name="error/errorpge.jsp"/> + <exclude name="forward/one.jsp"/> + <exclude name="include/foo.jsp"/> + <exclude name="jsptoserv/hello.jsp"/> + <exclude name="security/protected/error.jsp"/> + <exclude name="security/protected/index.jsp"/> + <exclude name="security/protected/login.jsp"/> + <exclude name="source.jsp"/> + </fileset> + </txt2html> + </target> + </configuration> + </execution> + <execution> + <id>move-Clock2-class</id> + <phase>process-classes</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <move file="${project.build.outputDirectory}/Clock2.class" + todir="${additional.files}/jsp/plugin/applet"/> + </target> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>${additional.files}</directory> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-Clock2-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/webapp/WEB-INF/jsp/applet</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-websocket-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-buildutil</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <properties> + <additional.files>${project.build.directory}/additional</additional.files> + </properties> +</project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/examples/src/main/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/webapps/examples webapp Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +target Added: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/pom.xml?rev=1630440&view=auto ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/pom.xml (added) +++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/pom.xml Thu Oct 9 13:28:28 2014 @@ -0,0 +1,31 @@ +<?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.webapps</groupId> + <artifactId>tomcat-webapps</artifactId> + <version>8.0.13-SNAPSHOT</version> + </parent> + + <artifactId>host-manager</artifactId> + <description>Tomcat host-manager webapp</description> + <packaging>war</packaging> + + </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/host-manager/src/main/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/webapps/host-manager webapp Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +target Added: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/pom.xml?rev=1630440&view=auto ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/pom.xml (added) +++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/pom.xml Thu Oct 9 13:28:28 2014 @@ -0,0 +1,31 @@ +<?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.webapps</groupId> + <artifactId>tomcat-webapps</artifactId> + <version>8.0.13-SNAPSHOT</version> + </parent> + + <artifactId>manager</artifactId> + <description>Tomcat manager webapp</description> + <packaging>war</packaging> + + </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/manager/src/main/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/webapps/manager webapp Added: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/pom.xml?rev=1630440&view=auto ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/pom.xml (added) +++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/pom.xml Thu Oct 9 13:28:28 2014 @@ -0,0 +1,40 @@ +<?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> + + <groupId>org.apache.tomcat.webapps</groupId> + <artifactId>tomcat-webapps</artifactId> + <description>Tomcat Webapps</description> + <packaging>pom</packaging> + <url>http://tomcat.apache.org</url> + + <modules> + <module>examples</module> + <module>ROOT</module> + <module>docs</module> + <module>manager</module> + <module>host-manager</module> + </modules> +</project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,7 +24,7 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-websocket-api</artifactId> - <description>WebSocket (JSR356) API</description> - + <artifactId>tomcat-websocket-api</artifactId> + <description>WebSocket (JSR356) API</description> + <url>http://tomcat.apache.org</url> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-websocket-api/src/main/java/javax/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/java/javax/websocket websocket Modified: tomcat/sandbox/trunk-maven-layout/tomcat-websocket/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-websocket/pom.xml?rev=1630440&r1=1630439&r2=1630440&view=diff ============================================================================== --- tomcat/sandbox/trunk-maven-layout/tomcat-websocket/pom.xml (original) +++ tomcat/sandbox/trunk-maven-layout/tomcat-websocket/pom.xml Thu Oct 9 13:28:28 2014 @@ -24,27 +24,28 @@ <version>8.0.13-SNAPSHOT</version> </parent> - <artifactId>tomcat-websocket</artifactId> - <description>Tomcat WebSocket (JSR356) implementation</description> - - <dependencies> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-websocket-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-util</artifactId> - </dependency> - </dependencies> + <artifactId>tomcat-websocket</artifactId> + <description>Tomcat WebSocket (JSR356) implementation</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-websocket-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-util</artifactId> + </dependency> + </dependencies> </project> Propchange: tomcat/sandbox/trunk-maven-layout/tomcat-websocket/src/main/java/org/apache/tomcat/ ------------------------------------------------------------------------------ --- svn:externals (added) +++ svn:externals Thu Oct 9 13:28:28 2014 @@ -0,0 +1 @@ +^/tomcat/trunk/java/javax/websocket websocket --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
