Author: olamy
Date: Mon Apr 23 17:20:26 2012
New Revision: 1329339
URL: http://svn.apache.org/viewvc?rev=1329339&view=rev
Log:
[MTOMCAT-143] contextFile and tomcatUsers defined in pom.xml are not used with
target tomcat7:run
configuring realm must be done before adding context.
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1329339&r1=1329338&r2=1329339&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Mon Apr 23 17:20:26 2012
@@ -731,15 +731,7 @@ public abstract class AbstractRunMojo
// create server
container = new Embedded();
container.setCatalinaHome( configurationDir.getAbsolutePath()
);
- MemoryRealm memoryRealm = new MemoryRealm()
- {
- @Override
- public Principal authenticate( String username, String
credentials )
- {
- return super.authenticate( username,
- credentials ); //To
change body of overridden methods use File | Settings | File Templates.
- }
- };
+ MemoryRealm memoryRealm = new MemoryRealm();
if ( tomcatUsers != null )
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1329339&r1=1329338&r2=1329339&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Mon Apr 23 17:20:26 2012
@@ -34,6 +34,7 @@ import org.apache.catalina.valves.Access
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
@@ -847,12 +848,6 @@ public abstract class AbstractRunMojo
Tomcat embeddedTomcat = new ExtendedTomcat( configurationDir );
- Context ctx = createContext( embeddedTomcat );
-
- if ( useNaming )
- {
- embeddedTomcat.enableNaming();
- }
embeddedTomcat.setBaseDir( configurationDir.getAbsolutePath()
);
MemoryRealm memoryRealm = new MemoryRealm();
@@ -868,6 +863,15 @@ public abstract class AbstractRunMojo
embeddedTomcat.setDefaultRealm( memoryRealm );
+
+ Context ctx = createContext( embeddedTomcat );
+
+ if ( useNaming )
+ {
+ embeddedTomcat.enableNaming();
+ }
+
+
embeddedTomcat.getHost().setAppBase( new File(
configurationDir, "webapps" ).getAbsolutePath() );
createStaticContext( embeddedTomcat, ctx,
embeddedTomcat.getHost() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
