Author: olamy
Date: Sun Oct 16 17:09:16 2011
New Revision: 1184871
URL: http://svn.apache.org/viewvc?rev=1184871&view=rev
Log:
[MTOMCAT-102] Add a mojo to build a standalone jar to run a web application:
add more option in the cli and -h --help
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/settings.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1184871&r1=1184870&r2=1184871&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Sun Oct 16 17:09:16 2011
@@ -692,4 +692,17 @@
</profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>people.apache.snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1184871&r1=1184870&r2=1184871&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Sun Oct 16 17:09:16
2011
@@ -264,6 +264,7 @@
<goals>
<goal>install</goal>
</goals>
+ <id>instral-plugin</id>
<phase>pre-integration-test</phase>
</execution>
</executions>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/settings.xml?rev=1184871&r1=1184870&r2=1184871&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/settings.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/settings.xml Sun Oct
16 17:09:16 2011
@@ -37,6 +37,16 @@ under the License.
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>local.snapshots</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -49,6 +59,16 @@ under the License.
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>local.snapshots</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1184871&r1=1184870&r2=1184871&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Sun Oct 16 17:09:16 2011
@@ -192,17 +192,17 @@ public class Tomcat7Runner
throws Exception
{
- if (extractDirectory.exists())
+ if ( extractDirectory.exists() )
{
- FileUtils.deleteDirectory(extractDirectory);
+ FileUtils.deleteDirectory( extractDirectory );
}
extractDirectory.mkdirs();
// create tomcat various paths
- new File(extractDirectory, "conf").mkdirs();
- new File(extractDirectory, "logs").mkdirs();
- new File(extractDirectory, "webapps").mkdirs();
- new File(extractDirectory, "work").mkdirs();
+ new File( extractDirectory, "conf" ).mkdirs();
+ new File( extractDirectory, "logs" ).mkdirs();
+ new File( extractDirectory, "webapps" ).mkdirs();
+ new File( extractDirectory, "work") .mkdirs();
String wars = runtimeProperties.getProperty( WARS_KEY );
StringTokenizer st = new StringTokenizer( wars,";" );
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java?rev=1184871&r1=1184870&r2=1184871&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Sun Oct 16 17:09:16 2011
@@ -60,11 +60,23 @@ public class Tomcat7RunnerCli
.withDescription("server.xml to use,
optionnal")
.create("serverXmlPath");
+ static Option resetExtract = OptionBuilder.withArgName("resetExtract")
+ .hasArg()
+ .withDescription("clean previous extract
directory")
+ .create("resetExtract");
+
+ static Option help = OptionBuilder
+ .withLongOpt( "help" )
+ .hasArg()
+ .withDescription("help")
+ .create("h");
+
static Options options = new Options();
static
{
- options.addOption( httpPort ).addOption( httpsPort ).addOption(
ajpPort ).addOption( serverXmlPath );
+ options.addOption( httpPort ).addOption( httpsPort ).addOption(
ajpPort ).addOption( serverXmlPath )
+ .addOption( resetExtract ).addOption( help );
}
@@ -80,10 +92,18 @@ public class Tomcat7RunnerCli
{
System.err.println( "Parsing failed. Reason: " + e.getMessage() );
HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp("java -jar ", Tomcat7RunnerCli.options);
+ formatter.printHelp( getCmdLineSyntax(), Tomcat7RunnerCli.options);
System.exit( 1 );
}
+ if ( line.hasOption( help.getOpt() ))
+ {
+ HelpFormatter formatter = new HelpFormatter();
+ formatter.printHelp( getCmdLineSyntax(), Tomcat7RunnerCli.options);
+ System.exit( 0 );
+ }
+
+
Tomcat7Runner tomcat7Runner = new Tomcat7Runner();
tomcat7Runner.runtimeProperties = buildStandaloneProperties();
@@ -105,6 +125,10 @@ public class Tomcat7RunnerCli
{
tomcat7Runner.ajpPort = Integer.parseInt( line.getOptionValue(
ajpPort.getOpt() ) );
}
+ if ( line.hasOption( resetExtract.getOpt() ))
+ {
+ tomcat7Runner.resetExtract = true;
+ }
// here we go
tomcat7Runner.run();
}
@@ -118,4 +142,9 @@ public class Tomcat7RunnerCli
properties.load( is );
return properties;
}
+
+ public static String getCmdLineSyntax()
+ {
+ return "java -jar [path to your exec war jar]";
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
