Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94F329DAD for ; Fri, 3 Feb 2012 16:28:20 +0000 (UTC) Received: (qmail 62298 invoked by uid 500); 3 Feb 2012 16:28:19 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 62185 invoked by uid 500); 3 Feb 2012 16:28:18 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 62176 invoked by uid 99); 3 Feb 2012 16:28:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 16:28:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 16:28:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 98F092388A40 for ; Fri, 3 Feb 2012 16:27:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240235 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/site/ tomcat6-maven-plugin/src/site/apt/ tomcat7-maven-plugin/src/site/ tomcat7-maven-plugin/src/site/apt/ Date: Fri, 03 Feb 2012 16:27:57 -0000 To: dev@tomcat.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120203162757.98F092388A40@eris.apache.org> Author: olamy Date: Fri Feb 3 16:27:56 2012 New Revision: 1240235 URL: http://svn.apache.org/viewvc?rev=1240235&view=rev Log: add an index page in tomcat7 with link to all maven goals Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/index.apt - copied, changed from r1240234, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm (with props) Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/site.xml Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt?rev=1240235&r1=1240234&r2=1240235&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt Fri Feb 3 16:27:56 2012 @@ -29,7 +29,7 @@ Tomcat Maven Plugin - The Tomcat Maven Plugin provides goals to manipulate WAR projects within the {{{http://tomcat.apache.org/}Tomcat}} servlet container. + The Tomcat6 Maven Plugin provides goals to manipulate WAR projects within the {{{http://tomcat.apache.org/}Tomcat}} servlet container version 6.x . * Goals Overview @@ -41,7 +41,7 @@ Tomcat Maven Plugin * Usage - Instructions on how to use the Tomcat Maven Plugin can be found on the {{{usage.html}usage page}}. + Instructions on how to use the Tomcat Maven Plugin can be found on the {{{./usage.html}usage page}}. * Examples Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml?rev=1240235&r1=1240234&r2=1240235&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml Fri Feb 3 16:27:56 2012 @@ -34,7 +34,6 @@ - Copied: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/index.apt (from r1240234, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/index.apt?p2=tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/index.apt&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt&r1=1240234&r2=1240235&rev=1240235&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/index.apt (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/index.apt Fri Feb 3 16:27:56 2012 @@ -1,10 +1,9 @@ --- Introduction --- - Mark Hobson - + Olivier Lamy --- - 2010-02-15 + 2012-02-03 --- ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -29,25 +28,12 @@ Tomcat Maven Plugin - The Tomcat Maven Plugin provides goals to manipulate WAR projects within the {{{http://tomcat.apache.org/}Tomcat}} servlet container. + The Tomcat7 Maven Plugin provides goals to manipulate WAR projects within the {{{http://tomcat.apache.org/}Tomcat}} servlet container version 7.x * Goals Overview - The goals for this plugin come in two categories: - - * {{{./context-goals.html}Goals to manipulate deployed projects within Tomcat}} - - * {{{./container-goals.html}Goals to obtain information from Tomcat}} + The goals for this plugin are available here {{{./plugin-info.html}goals page}}. * Usage - Instructions on how to use the Tomcat Maven Plugin can be found on the {{{usage.html}usage page}}. - -* Examples - - To provide you with better understanding of some usages of the Tomcat Maven Plugin, - you can take a look into the following examples: - - * {{{./examples/add-system-properties.html}Adding System Properties}} - - * {{{./examples/deployment.html}How to deploy projects to Tomcat}} + Instructions on how to use the Tomcat Maven Plugin can be found on the {{{./usage.html}usage page}}. Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm?rev=1240235&view=auto ============================================================================== --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm (added) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm Fri Feb 3 16:27:56 2012 @@ -0,0 +1,182 @@ + --- + Usage + --- + Olivier Lamy + --- + 2012-02-03 + --- + + ~~ 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/doxia/references/apt-format.html + +Usage + + If no explicit configuration is provided then the Tomcat7 Maven Plugin defaults to + the following: + + * Tomcat manager URL of <<>> + + * Authentication details of username <<>> and no password + + * Context path of <<>> + + [] + + These can be overridden as described below. + +* Using a different Tomcat manager URL + + To configure the plugin for a different Tomcat instance, add a plugin + configuration block to your <<>> as follows: + ++-- + + ... + + ... + + ... + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${project.version} + + http://www.mydomain.com:1234/mymanager + + + ... + + ... + + ... + ++-- + + The default Tomcat manager URL is <<>>. + +* Using different Tomcat manager authentication details + + To specify a different username and password to use when authenticating with + Tomcat manager: + + [[1]] Add a plugin configuration block to your <<>>: + ++-- + + ... + + ... + + ... + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${project.version} + + myserver + + + ... + + ... + + ... + ++-- + + [[2]] Add a corresponding <<>> block to your <<>>: + ++-- + + ... + + ... + + myserver + myusername + mypassword + + ... + + ... + ++-- + + [] + + The default authentication details are username <<>> and no password. + +* Using a different context path + + The default context path is <<>>. + + To change the context path to <<>> configure the plugin like this: + ++-- + + ... + + ... + + ... + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${project.version} + + /mycontext + + + ... + + ... + + ... + ++-- + + If you are using <<>> to change the name of your WAR + file, you can use that value when you configure the context path as well. To do + that add the following configuration block to your <<>>: + ++-- + + ... + + ... + mycontext + ... + + ... + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${project.version} + + /\${project.build.finalName} + + + ... + + ... + + ... + ++-- Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/usage.apt.vm ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/site.xml?rev=1240235&r1=1240234&r2=1240235&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/site.xml Fri Feb 3 16:27:56 2012 @@ -22,10 +22,10 @@ + - --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org