fixed && thanks! Olivier
On 28 July 2014 18:02, Konstantin Kolinko <knst.koli...@gmail.com> wrote: > 2014-07-23 8:39 GMT+04:00 <ol...@apache.org>: >> Author: olamy >> Date: Wed Jul 23 04:39:13 2014 >> New Revision: 1612761 >> >> URL: http://svn.apache.org/r1612761 >> Log: >> Added a new parameter, “sessionManagerFactory”. If you specify a class that >> implements a createSessionManager() function, this class will be called and >> used to construct the session manager you want. This is useful for having >> your standalone instance use the memcached-session-manager project. >> >> Modified: >> >> 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/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=1612761&r1=1612760&r2=1612761&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 >> Wed Jul 23 04:39:13 2014 >> @@ -18,38 +18,26 @@ package org.apache.tomcat.maven.runner; >> * under the License. >> */ >> >> -import org.apache.catalina.Context; >> -import org.apache.catalina.Host; >> -import org.apache.catalina.connector.Connector; >> -import org.apache.catalina.core.StandardContext; >> -import org.apache.catalina.startup.Catalina; >> -import org.apache.catalina.startup.ContextConfig; >> -import org.apache.catalina.startup.Tomcat; >> -import org.apache.catalina.valves.AccessLogValve; >> -import org.apache.catalina.valves.RemoteIpValve; >> -import org.apache.juli.ClassLoaderLogManager; >> -import org.apache.tomcat.util.ExceptionUtils; >> -import org.apache.tomcat.util.http.fileupload.FileUtils; >> - >> -import java.io.BufferedOutputStream; >> -import java.io.File; >> -import java.io.FileInputStream; >> -import java.io.FileNotFoundException; >> -import java.io.FileOutputStream; >> -import java.io.IOException; >> -import java.io.InputStream; >> +import java.io.*; > > 1). It is unusual to see star imports. Usually explicit imports are used. > >> (...) >> >> 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=1612761&r1=1612760&r2=1612761&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 >> Wed Jul 23 04:39:13 2014 >> @@ -87,6 +87,10 @@ public class Tomcat7RunnerCli >> >> static Option extractDirectory = OptionBuilder.withArgName( >> "extractDirectory" ).hasArg().withDescription( >> "path to extract war content, default value: .extract" ).create( >> "extractDirectory" ); >> + >> + static Option sessionManagerFactoryClassName = >> OptionBuilder.withArgName( "className" ).hasArg().withDescription( >> + "classname of a factory that creates a session manager" ).create( >> "sessionManagerFactory" ); >> + >> >> static Option loggerName = OptionBuilder.withArgName( "loggerName" >> ).hasArg().withDescription( >> "logger to use: slf4j to use slf4j bridge on top of jul" ).create( >> "loggerName" ); >> @@ -101,7 +105,7 @@ public class Tomcat7RunnerCli >> options.addOption( httpPort ).addOption( httpsPort ).addOption( >> ajpPort ).addOption( serverXmlPath ).addOption( >> resetExtract ).addOption( help ).addOption( debug ).addOption( >> sysProps ).addOption( >> httpProtocol ).addOption( clientAuth ).addOption( keyAlias >> ).addOption( obfuscate ).addOption( >> - extractDirectory ).addOption( loggerName ).addOption( >> uriEncoding ).addOption( maxPostSize ); >> + extractDirectory >> ).addOption(sessionManagerFactoryClassName).addOption( loggerName >> ).addOption( uriEncoding ); > > > 2). The old chain of "addOption" calls ended with ".addOption( > maxPostSize );". That option is missing from the new chain. > > I suspect that this removal was unintended. > > Best regards, > Konstantin Kolinko > >> } >> >> >> @@ -206,6 +210,11 @@ public class Tomcat7RunnerCli >> { >> tomcat7Runner.extractDirectory = line.getOptionValue( >> extractDirectory.getOpt() ); >> } >> + >> + if ( line.hasOption( sessionManagerFactoryClassName.getOpt() ) ) >> + { >> + tomcat7Runner.sessionManagerFactoryClassName = >> line.getOptionValue( sessionManagerFactoryClassName.getOpt() ); >> + } >> >> if ( line.hasOption( loggerName.getOpt() ) ) >> { >> >> >> >> --------------------------------------------------------------------- > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Olivier Lamy Ecetera: http://ecetera.com.au http://twitter.com/olamy | http://linkedin.com/in/olamy --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
