Author: olamy
Date: Mon Oct 17 14:02:45 2011
New Revision: 1185176
URL: http://svn.apache.org/viewvc?rev=1185176&view=rev
Log:
option to enable naming
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1185176&r1=1185175&r2=1185176&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Mon Oct 17 14:02:45 2011
@@ -192,6 +192,14 @@ public abstract class AbstractExecWarMoj
* @required
*/
private String attachArtifactClassifierType;
+
+ /**
+ * to enable naming when starting tomcat
+ *
+ * @parameter expression="${maven.tomcat.exec.war.enableNaming}"
default-value="false"
+ * @required
+ */
+ private boolean enableNaming;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -241,6 +249,7 @@ public abstract class AbstractExecWarMoj
//* tomcat jars
//* file tomcat.standalone.properties with possible values :
// * useServerXml=true/false to use directly the one provided
+ // * enableNaming=true/false
// * wars=foo.war|contextpath;bar.war ( |contextpath is
optionnal if empty use the war name )
//* optionnal: conf/ with usual tomcat configuration files
//* MANIFEST with Main-Class
@@ -258,6 +267,8 @@ public abstract class AbstractExecWarMoj
properties.put( Tomcat7Runner.WARS_KEY , path + ".war|" + path
);
}
+ properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString(
enableNaming ) );
+
if ( "pom".equals( project.getPackaging() ) && (
warRunDependencies != null && !warRunDependencies.isEmpty() ) )
{
for (WarRunDependency warRunDependency : warRunDependencies )
@@ -308,7 +319,7 @@ public abstract class AbstractExecWarMoj
tmpPropertiesFileOutputStream.close();
os.putArchiveEntry( new JarArchiveEntry(
Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) );
- IOUtils.copy( new FileInputStream(tmpPropertiesFile), os );
+ IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os );
os.closeArchiveEntry();
Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT?rev=1185176&r1=1185175&r2=1185176&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT Mon Oct 17 14:02:45
2011
@@ -22,6 +22,7 @@ The generated standalone jar will contai
* useServerXml=true/false to use directly the one provided
in the maven plugin configuration
* wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty
use the war name)
+ * enableNaming=true/false
* optionnal: conf/ with usual tomcat configuration files
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=1185176&r1=1185175&r2=1185176&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
Mon Oct 17 14:02:45 2011
@@ -47,6 +47,9 @@ public class Tomcat7Runner
// contains war name wars=foo.war,bar.war
public static final String WARS_KEY = "wars";
+
+ public static final String ENABLE_NAMING_KEY = "enableNaming";
+
public int httpPort;
@@ -95,8 +98,7 @@ public class Tomcat7Runner
if ( serverXmlPath != null || useServerXml() )
{
container = new Catalina();
- // FIXME get this from runtimeProperties ?
- //container.setUseNaming(this.useNaming);
+ container.setUseNaming( this.enableNaming() );
if ( serverXmlPath != null && new File( serverXmlPath ).exists() )
{
container.setConfig( serverXmlPath );
@@ -107,6 +109,12 @@ public class Tomcat7Runner
container.start();
} else {
tomcat = new Tomcat();
+
+ if ( this.enableNaming() )
+ {
+ tomcat.enableNaming( );
+ }
+
tomcat.getHost().setAppBase(new File(extractDirectory,
"webapps").getAbsolutePath());
Connector connector = new Connector( "HTTP/1.1" );
@@ -354,7 +362,7 @@ public class Tomcat7Runner
public boolean useServerXml()
{
- return Boolean.parseBoolean( runtimeProperties.getProperty(
USE_SERVER_XML_KEY ));
+ return Boolean.parseBoolean( runtimeProperties.getProperty(
USE_SERVER_XML_KEY, Boolean.FALSE.toString() ));
}
@@ -365,4 +373,9 @@ public class Tomcat7Runner
System.out.println(message);
}
}
+
+ public boolean enableNaming()
+ {
+ return Boolean.parseBoolean( runtimeProperties.getProperty(
ENABLE_NAMING_KEY, Boolean.FALSE.toString() ));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
