svn commit: r1182729 - in /tomcat/maven-plugin/trunk: tomcat-maven-plugin-it/src/main/java/org/codehaus/ tomcat6-maven-plugin/src/test/java/org/codehaus/ tomcat7-maven-plugin/src/test/java/org/apache/
Author: olamy Date: Thu Oct 13 09:04:34 2011 New Revision: 1182729 URL: http://svn.apache.org/viewvc?rev=1182729&view=rev Log: remove empty directories Removed: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182733 - /tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/
Author: olamy Date: Thu Oct 13 09:09:13 2011 New Revision: 1182733 URL: http://svn.apache.org/viewvc?rev=1182733&view=rev Log: remove not needed resources Removed: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/test/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1182738 - in /tomcat/maven-plugin/trunk: tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/ tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/ tomcat6-maven-pl
Author: olamy
Date: Thu Oct 13 09:23:38 2011
New Revision: 1182738
URL: http://svn.apache.org/viewvc?rev=1182738&view=rev
Log:
move it tests metadata to o.a.t.m namespace
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1182738&r1=1182737&r2=1182738&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Thu Oct 13 09:23:38 2011
@@ -98,7 +98,7 @@ public abstract class AbstractWarProject
verifier.setDebugJvm( Boolean.getBoolean( "verifier.debugJvm" ) );
verifier.displayStreamBuffers();
-verifier.deleteArtifact( "org.codehaus.mojo.tomcat.it",
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
+verifier.deleteArtifact( "org.apache.tomcat.maven.it",
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
}
@After
@@ -107,7 +107,7 @@ public abstract class AbstractWarProject
{
httpClient.getConnectionManager().shutdown();
verifier.resetStreams();
-verifier.deleteArtifact( "org.codehaus.mojo.tomcat.it",
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
+verifier.deleteArtifact( "org.apache.tomcat.maven.it",
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
}
/**
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1182738&r1=1182737&r2=1182738&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
Thu Oct 13 09:23:38 2011
@@ -20,7 +20,7 @@
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
- org.codehaus.mojo.tomcat.it
+ org.apache.tomcat.maven.it
simple-war-project
1.0-SNAPSHOT
war
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1182738&r1=1182737&r2=1182738&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
Thu Oct 13 09:23:38 2011
@@ -20,7 +20,7 @@
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
- org.codehaus.mojo.tomcat.it
+ org.apache.tomcat.maven.it
simple-war-project
1.0-SNAPSHOT
war
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src
svn commit: r1182844 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy
Date: Thu Oct 13 13:26:22 2011
New Revision: 1182844
URL: http://svn.apache.org/viewvc?rev=1182844&view=rev
Log:
fix jar path
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1182844&r1=1182843&r2=1182844&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Thu Oct 13 13:26:22 2011
@@ -132,7 +132,7 @@ public class DefaultClassLoaderEntriesCa
} );
for (String jar : jars)
{
-classLoaderEntries.add( new File( jar
).toURI().toString() );
+classLoaderEntries.add( new
File(libsDirectory, jar ).toURI().toString() );
}
}
File classesDirectory = new File( tmpDir,
"WEB-INF/classes" );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183131 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Thu Oct 13 22:05:01 2011 New Revision: 1183131 URL: http://svn.apache.org/viewvc?rev=1183131&view=rev Log: use a new skin for website Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1183131&r1=1183130&r2=1183131&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Thu Oct 13 22:05:01 2011 @@ -31,9 +31,9 @@ http://tomcat.apache.org/maven-plugin/ -org.apache.commons -commons-skin -2 +org.apache.maven.skins +maven-fluido-skin +1.0-SNAPSHOT - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183147 - in /tomcat/maven-plugin/trunk: src/site/ src/site/apt/ tomcat6-maven-plugin/src/site/ tomcat6-maven-plugin/src/site/apt/
Author: olamy
Date: Thu Oct 13 22:31:25 2011
New Revision: 1183147
URL: http://svn.apache.org/viewvc?rev=1183147&view=rev
Log:
start working on the web site
Added:
tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt (contents,
props changed)
- copied, changed from r1183131,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt
tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt (contents, props
changed)
- copied, changed from r1183131,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt
Removed:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt
Modified:
tomcat/maven-plugin/trunk/src/site/apt/index.apt
tomcat/maven-plugin/trunk/src/site/site.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml
Copied: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt (from
r1183131,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt?p2=tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/container-goals.apt&r1=1183131&r2=1183147&rev=1183147&view=diff
==
(empty)
Propchange: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt
--
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt
--
svn:keywords = Author Date Id Revision
Copied: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt (from
r1183131,
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt?p2=tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/apt/context-goals.apt&r1=1183131&r2=1183147&rev=1183147&view=diff
==
(empty)
Propchange: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt
--
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt
--
svn:keywords = Author Date Id Revision
Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt?rev=1183147&r1=1183146&r2=1183147&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/index.apt Thu Oct 13 22:31:25 2011
@@ -26,8 +26,21 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
- This is the new for the Tomcat Maven Plugin (previously hosted at Codehaus).
+Apache Tomcat Maven Plugin
+
+ This is the new home for the Tomcat Maven Plugin (previously hosted at
Codehaus).
The version 2.0 which will support Tomcat7 is under developpement.
Prior to version 2.0, tomcat mojos has been renamed to tomcat6 and tomcat7
with the same goals.
+ The Tomcat Maven Plugin provides goals to manipulate WAR projects within the
{{{http://tomcat.apache.org/}Tomcat}} servlet container.
+
+* 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}}
+
+
Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1183147&r1=1183146&r2=1183147&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Thu Oct 13 22:31:25 2011
@@ -46,6 +46,8 @@
+
+
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=1183147&r1=1183146&r2=1183147&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk
svn commit: r1183149 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml tomcat-maven-plugin-it/pom.xml tomcat6-maven-plugin/pom.xml tomcat7-maven-plugin/pom.xml
Author: olamy Date: Thu Oct 13 22:34:45 2011 New Revision: 1183149 URL: http://svn.apache.org/viewvc?rev=1183149&view=rev Log: fix project names Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/pom.xml tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1183149&r1=1183148&r2=1183149&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Thu Oct 13 22:34:45 2011 @@ -28,7 +28,7 @@ 2.0-SNAPSHOT common-tomcat-maven-plugin - Tomcat Maven Plugin :: Common API + Apache Tomcat Maven Plugin :: Common API Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183149&r1=1183148&r2=1183149&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Oct 13 22:34:45 2011 @@ -30,7 +30,7 @@ org.apache.tomcat.maven tomcat-maven-plugin pom - Tomcat Maven Plugin + Apache Tomcat Maven Plugin 2.0-SNAPSHOT The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet container. Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1183149&r1=1183148&r2=1183149&view=diff == --- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original) +++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Thu Oct 13 22:34:45 2011 @@ -30,7 +30,7 @@ tomcat-maven-plugin-it jar - Tomcat Maven Plugin :: Integration Tests + Apache Tomcat Maven Plugin :: Integration Tests
svn commit: r1183150 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Thu Oct 13 22:36:51 2011 New Revision: 1183150 URL: http://svn.apache.org/viewvc?rev=1183150&view=rev Log: link to sonar report Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183150&r1=1183149&r2=1183150&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Thu Oct 13 22:36:51 2011 @@ -527,6 +527,11 @@ findbugs-maven-plugin 2.3.2 + +org.codehaus.sonar-plugins +maven-report +0.1 + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183258 - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/ tomcat6-maven-plugin/ tomcat6-maven-plugin/src/test/ tomcat6-maven-plugin/src/
Author: olamy
Date: Fri Oct 14 09:27:43 2011
New Revision: 1183258
URL: http://svn.apache.org/viewvc?rev=1183258&view=rev
Log:
add integration test to ensure we start https and ajp in tomcat6 plugin
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183258&r1=1183257&r2=1183258&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Fri Oct 14 09:27:43 2011
@@ -57,6 +57,8 @@
apache.snapshots
1973
+
+2003
2001
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1183258&r1=1183257&r2=1183258&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Fri Oct 14 09:27:43 2011
@@ -211,6 +211,11 @@ public abstract class AbstractWarProject
return System.getProperty( "its.http.port" );
}
+protected static String getHttpsItPort()
+{
+return System.getProperty( "its.https.port" );
+}
+
protected static String getAjpItPort()
{
return System.getProperty( "its.ajp.port" );
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1183258&r1=1183257&r2=1183258&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Fri Oct 14 09:27:43
2011
@@ -37,6 +37,7 @@
6.0.33
${basedir}/target/
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
+${basedir}/src/test/keystore
${mavenVersion}
@@ -256,6 +257,7 @@
${verifier.maven.debug}
${verifier.debugJvm}
${its.http.port}
+${its.https.port}
${its.ajp.port}
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java?rev=1183258&r1=1183257&r2=1183258&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
Fri Oct 14 09:27:43 2011
@@ -32,5 +32,7 @@ public class Tomcat6RunMultiConfigIT
throws VerificationException
{
verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" +
getHttpItPort());
+verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" +
getHttpsItPort());
+verifier.verifyTextInLog("INFO: JK: ajp13 listening on /0.0.0.0:" +
getAjpItPort());
}
}
Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore?rev=1183258&view=auto
==
Files tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore (added)
and tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore Fri Oct 14
09:27:43 2011 differ
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1183258&r1
svn commit: r1183265 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/ tomcat7-maven-plugin/ tomcat7-maven-plugin/src/test/ tomcat7-maven-plugin/src/tes
Author: olamy
Date: Fri Oct 14 09:43:13 2011
New Revision: 1183265
URL: http://svn.apache.org/viewvc?rev=1183265&view=rev
Log:
add integration test to ensure we start https and ajp in tomcat7 plugin
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/keystore
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1183265&r1=1183264&r2=1183265&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Fri Oct 14 09:43:13 2011
@@ -68,7 +68,6 @@
\${project.build.directory}/tc
/multi-config
${its.http.port}
-
${its.https.port}
${keystoreTestPath}
${its.ajp.port}
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=1183265&r1=1183264&r2=1183265&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Fri Oct 14 09:43:13
2011
@@ -36,6 +36,7 @@
7.0.22
${basedir}/target/
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
+${basedir}/src/test/keystore
@@ -271,6 +272,7 @@
${verifier.maven.debug}
${verifier.debugJvm}
${its.http.port}
+${its.https.port}
${its.ajp.port}
false
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java?rev=1183265&r1=1183264&r2=1183265&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
Fri Oct 14 09:43:13 2011
@@ -32,5 +32,7 @@ public class Tomcat7RunMultiConfigIT
throws VerificationException
{
verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-"
+ getHttpItPort() + "\"]");
+verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-"
+ getHttpsItPort() + "\"]");
+verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"ajp-bio-"
+ getAjpItPort() + "\"]");
}
}
Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/keystore
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/keystore?rev=1183265&view=auto
==
Files tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/keystore (added)
and tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/keystore Fri Oct 14
09:43:13 2011 differ
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1183265&r1=1183264&r2=1183265&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Fri Oct 14 09:43:13 2011
@@ -68,11 +68,9 @@
\${project.build.directory}/tc
/multi-config
${its.http.port}
-
+ ${its.https.port}
+ ${keystoreTestPath}
+ ${its.ajp.port}
UTF-8
svn commit: r1183268 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Fri Oct 14 09:52:15 2011 New Revision: 1183268 URL: http://svn.apache.org/viewvc?rev=1183268&view=rev Log: inherit reports and modules for sub modules site Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1183268&r1=1183267&r2=1183268&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Fri Oct 14 09:52:15 2011 @@ -51,8 +51,8 @@ - - + + http://www.apache.org/foundation/how-it-works.html"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183290 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Fri Oct 14 10:46:48 2011 New Revision: 1183290 URL: http://svn.apache.org/viewvc?rev=1183290&view=rev Log: add trademark notes on footer Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1183290&r1=1183289&r2=1183290&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Fri Oct 14 10:46:48 2011 @@ -61,4 +61,13 @@ http://www.apache.org/foundation/thanks.html"/> + + + + + Apache Tomcat, Apache, the Apache feather logo, and the Apache Tomcat project logo are trademarks of The Apache Software Foundation. + All other marks mentioned may be trademarks or registered trademarks of their respective owners. + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183758 - in /tomcat/maven-plugin/trunk: pom.xml tomcat6-maven-plugin/pom.xml tomcat7-maven-plugin/pom.xml
Author: olamy
Date: Sat Oct 15 23:01:35 2011
New Revision: 1183758
URL: http://svn.apache.org/viewvc?rev=1183758&view=rev
Log:
move tomcat7 dependencies to top level pom in depsMngt to have it available for
runner module.
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183758&r1=1183757&r2=1183758&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Sat Oct 15 23:01:35 2011
@@ -16,8 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+-->http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
@@ -63,6 +62,7 @@
2001
2008
+7.0.22
@@ -215,10 +215,127 @@
tomcat-maven-plugin-it
tomcat6-maven-plugin
tomcat7-maven-plugin
+tomcat7-war-runner
+
+
+org.eclipse.jdt.core.compiler
+ecj
+3.7
+
+
+
+org.apache.tomcat.embed
+tomcat-embed-core
+${tomcat7Version}
+
+
+org.apache.tomcat
+tomcat-util
+${tomcat7Version}
+
+
+org.apache.tomcat
+tomcat-coyote
+${tomcat7Version}
+
+
+org.apache.tomcat
+tomcat-api
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-jdbc
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-dbcp
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-servlet-api
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-jsp-api
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-jasper
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-jasper-el
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-el-api
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-catalina
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-tribes
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-catalina-ha
+${tomcat7Version}
+
+
+
+org.apache.tomcat
+tomcat-annotations-api
+${tomcat7Version}
+
+
+
+
+
+
+org.apache.tomcat
+tomcat-juli
+${tomcat7Version}
+
+
+
+org.apache.tomcat.embed
+tomcat-embed-logging-juli
+${tomcat7Version}
+
+
+org.apache.tomcat.embed
+tomcat-embed-logging-log4j
+${tomcat7Version}
+
+
+
+
org.apache.tomcat.maven
common-tomcat-maven-plugin
@@ -539,4 +656,4 @@
-
+
\ No newline at end of file
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1183758&r1=1183757&r2=1183758&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Sat Oct 15 23:01:35
2011
@@ -113,7 +113,6 @@
org.eclipse.jdt.core.compiler
ecj
- 3.7
org.apache.tomcat
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=1183758&r1=1183757&r2=1183758&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Sat Oct 15 23:01:35
2011
@@ -104,12 +104,6 @@
- org.eclipse.jdt.core.compiler
- ecj
- 3.7
-
-
-
org.apache.tomcat
tomcat-catalina
${tomcat.version}
@@ -153,7 +147,10 @@
${tomcat.version}
-
+
+ org.eclipse.jdt.core.compiler
+ ecj
+
svn commit: r1183762 - /tomcat/maven-plugin/trunk/.gitignore
Author: olamy Date: Sat Oct 15 23:06:52 2011 New Revision: 1183762 URL: http://svn.apache.org/viewvc?rev=1183762&view=rev Log: ignore .extract used for test Modified: tomcat/maven-plugin/trunk/.gitignore Modified: tomcat/maven-plugin/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/.gitignore?rev=1183762&r1=1183761&r2=1183762&view=diff == --- tomcat/maven-plugin/trunk/.gitignore (original) +++ tomcat/maven-plugin/trunk/.gitignore Sat Oct 15 23:06:52 2011 @@ -6,3 +6,4 @@ target .project .settings .DS_Store +.extract - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1183764 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/webapp/web.xml tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat
Author: olamy
Date: Sat Oct 15 23:08:48 2011
New Revision: 1183764
URL: http://svn.apache.org/viewvc?rev=1183764&view=rev
Log:
fix web.xml use in test and wait indefinitely after container start
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/webapp/web.xml
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/it/simple-war-exec-project/src/main/webapp/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/webapp/web.xml?rev=1183764&r1=1183763&r2=1183764&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/webapp/web.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/src/main/webapp/web.xml
Sat Oct 15 23:08:48 2011
@@ -1,3 +1,5 @@
+
+
-
-http://java.sun.com/xml/ns/j2ee"; version="2.4"
+http://java.sun.com/xml/ns/j2ee"; version="2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
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=1183764&r1=1183763&r2=1183764&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
Sat Oct 15 23:08:48 2011
@@ -95,7 +95,7 @@ public class Tomcat7Runner
{
container.setConfig( new File( extractDirectory,
"conf/server.xml" ).getAbsolutePath() );
}
-container.start();
+container.start();
} else {
tomcat = new Tomcat();
tomcat.getHost().setAppBase(new File(extractDirectory,
"webapps").getAbsolutePath());
@@ -149,10 +149,30 @@ public class Tomcat7Runner
//ajpConnector.setURIEncoding(uriEncoding);
tomcat.getService().addConnector( ajpConnector );
}
+
tomcat.start();
}
+waitIndefinitely();
+
+}
+
+private void waitIndefinitely()
+{
+Object lock = new Object();
+
+synchronized ( lock )
+{
+try
+{
+lock.wait();
+}
+catch ( InterruptedException exception )
+{
+System.exit( 1 );
+}
+}
}
public void stop()
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1184777 - in /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src: it/simple-war-exec-project/pom.xml main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Sun Oct 16 07:43:11 2011
New Revision: 1184777
URL: http://svn.apache.org/viewvc?rev=1184777&view=rev
Log:
[MTOMCAT-102] Add a mojo to build a standalone jar to run a web application:
use path field to store webapp to have a more nice name than
projet.build.finalName
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/pom.xml?rev=1184777&r1=1184776&r2=1184777&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/pom.xml
Sun Oct 16 07:43:11 2011
@@ -65,6 +65,7 @@
package
+ foo
src/main/tomcatconf/server.xml
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=1184777&r1=1184776&r2=1184777&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
Sun Oct 16 07:43:11 2011
@@ -109,6 +109,15 @@ public abstract class AbstractExecWarMoj
*/
private String finalName;
+/**
+ * The webapp context path to use for the web application being run.
+ * The name to store webapp in exec jar. Do not use /
+ *
+ * @parameter expression="${maven.tomcat.path}"
default-value="${project.artifactId}"
+ * @required
+ */
+protected String path;
+
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -156,9 +165,8 @@ public abstract class AbstractExecWarMoj
os =
new
ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.JAR,
execWarJarOutputStream);
-
// TODO control project packaging is war
-os.putArchiveEntry( new JarArchiveEntry(
project.getBuild().getFinalName() + ".war" ) );
+os.putArchiveEntry( new JarArchiveEntry( path + ".war" ) );
IOUtils.copy( new FileInputStream(artifact.getFile()), os );
os.closeArchiveEntry();
@@ -176,7 +184,7 @@ public abstract class AbstractExecWarMoj
properties.put(Tomcat7Runner.USE_SERVER_XML_KEY,
Boolean.FALSE.toString() );
}
-properties.put( Tomcat7Runner.WARS_KEY ,
project.getBuild().getFinalName() + ".war" );
+properties.put( Tomcat7Runner.WARS_KEY , path + ".war" );
properties.store( tmpPropertiesFileOutputStream, "created by
Apache Tomcat Maven plugin" );
tmpPropertiesFileOutputStream.flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1184871 - in /tomcat/maven-plugin/trunk: ./ tomcat7-maven-plugin/ tomcat7-maven-plugin/src/it/ tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/
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 @@
+
+
+ people.apache.snapshots
+ http://people.apache.org/repo/m2-snapshot-repository
+
+false
+
+
+true
+
+
+
+
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 @@
install
+instral-plugin
pre-integration-test
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.
true
+
+ local.snapshots
+ @localRepositoryUrl@
+
+false
+
+
+true
+
+
@@ -49,6 +59,16 @@ under the License.
true
+
+ local.snapshots
+ @localRepositoryUrl@
+
+false
+
+
+true
+
+
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
===
svn commit: r1184872 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
Author: olamy
Date: Sun Oct 16 17:09:34 2011
New Revision: 1184872
URL: http://svn.apache.org/viewvc?rev=1184872&view=rev
Log:
really verify something in this integration test
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
(with props)
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh?rev=1184872&view=auto
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
(added)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
Sun Oct 16 17:09:34 2011
@@ -0,0 +1,81 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.jar.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+File target = new File( basedir, "target" );
+if ( !target.exists() || !target.isDirectory() )
+{
+System.err.println( "target file is missing or not a directory." );
+return false;
+}
+
+File artifact = new File( target,
"simple-war-exec-project-1.0-SNAPSHOT-war-exec.jar" );
+if ( !artifact.exists() || artifact.isDirectory() )
+{
+System.err.println( "artifact file is missing or a directory." );
+return false;
+}
+
+Set contents = new HashSet();
+
+JarFile jar = new JarFile( artifact );
+Enumeration jarEntries = jar.entries();
+while ( jarEntries.hasMoreElements() )
+{
+JarEntry entry = (JarEntry) jarEntries.nextElement();
+if ( !entry.isDirectory() )
+{
+// Only compare files
+contents.add( entry.getName() );
+}
+}
+
+if (!contents.contains("foo.war") )
+{
+System.err.println( "foo.war." );
+return false;
+}
+if (!contents.contains("conf/server.xml") )
+{
+System.err.println( "conf/server.xml is missing." );
+return false;
+}
+if (!contents.contains("tomcat.standalone.properties") )
+{
+System.err.println( "tomcat.standalone.properties is missing." );
+return false;
+}
+
+}
+catch( Throwable e )
+{
+e.printStackTrace();
+result = false;
+}
+
+return result;
\ No newline at end of file
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
--
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/it/simple-war-exec-project/verify.bsh
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1184873 - /tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt
Author: olamy Date: Sun Oct 16 17:10:02 2011 New Revision: 1184873 URL: http://svn.apache.org/viewvc?rev=1184873&view=rev Log: fix repository url to use Modified: tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt Modified: tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt?rev=1184873&r1=1184872&r2=1184873&view=diff == --- tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt (original) +++ tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt Sun Oct 16 17:10:02 2011 @@ -34,11 +34,24 @@ Testing SNAPSHOT +-- + + + people.apache.snapshots + http://people.apache.org/repo/m2-snapshot-repository + +false + + +true + + + + apache.snapshots Apache Snapshots - https://repository.apache.org/content/groups/snapshots-group/ + http://people.apache.org/repo/m2-snapshot-repository false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185051 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ tomcat7-war-runner/ tomcat7-war-runner/src/main/java/org/apache/tom
Author: olamy
Date: Mon Oct 17 09:15:57 2011
New Revision: 1185051
URL: http://svn.apache.org/viewvc?rev=1185051&view=rev
Log:
[MTOMCAT-102] Add a mojo to build a standalone jar to run a web application:
add possibility to use a pom project which configured war dependencies to add
in the generated exec jar.
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.java
(with props)
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
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.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=1185051&r1=1185050&r2=1185051&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 09:15:57 2011
@@ -26,10 +26,16 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo;
import org.apache.tomcat.maven.runner.Tomcat7Runner;
import org.apache.tomcat.maven.runner.Tomcat7RunnerCli;
@@ -63,7 +69,7 @@ public abstract class AbstractExecWarMoj
* @required
* @readonly
*/
-private Artifact artifact;
+private Artifact projectArtifact;
/**
* The maven project.
@@ -118,6 +124,40 @@ public abstract class AbstractExecWarMoj
*/
protected String path;
+/**
+ * @parameter
+ */
+protected List warRunDependencies;
+
+/**
+ * @component
+ */
+protected ArtifactResolver artifactResolver;
+
+/**
+ * Maven Artifact Factory component.
+ *
+ * @component
+ */
+private ArtifactFactory artifactFactory;
+
+/**
+ * Location of the local repository.
+ *
+ * @parameter expression="${localRepository}"
+ * @readonly
+ * @required
+ */
+private ArtifactRepository local;
+
+/**
+ * List of Remote Repositories used by the resolver
+ *
+ * @parameter expression="${project.remoteArtifactRepositories}"
+ * @readonly
+ * @required
+ */
+protected List remoteRepos;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -142,11 +182,20 @@ public abstract class AbstractExecWarMoj
try
{
-tmpPropertiesFile = File.createTempFile( "war-exec", "properties"
);
-tmpPropertiesFile.deleteOnExit();
-tmpManifestFile = File.createTempFile( "war-exec", "manifest" );
-tmpManifestFile.deleteOnExit();
+tmpPropertiesFile = new File( buildDirectory,
"war-exec.properties" );
+if ( tmpPropertiesFile.exists() )
+{
+tmpPropertiesFile.delete();
+}
+tmpPropertiesFile.getParentFile().mkdirs();
+
+tmpManifestFile = new File( buildDirectory, "war-exec.manifest" );
+if ( tmpManifestFile.exists() )
+{
+tmpManifestFile.delete();
+}
tmpPropertiesFileOutputStream = new FileOutputStream(
tmpPropertiesFile );
+execWarJar.getParentFile().mkdirs();
execWarJar.createNewFile();
execWarJarOutputStream = new FileOutputStream( execWarJar );
@@ -158,19 +207,53 @@ public abstract class AbstractExecWarMoj
//* tomcat jars
//
svn commit: r1185052 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon Oct 17 09:16:16 2011
New Revision: 1185052
URL: http://svn.apache.org/viewvc?rev=1185052&view=rev
Log:
[MTOMCAT-102] Add a mojo to build a standalone jar to run a web application:
attach the generated artifact.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.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=1185052&r1=1185051&r2=1185052&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 09:16:16 2011
@@ -35,6 +35,7 @@ import org.apache.maven.model.Dependency
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo;
import org.apache.tomcat.maven.runner.Tomcat7Runner;
@@ -97,12 +98,12 @@ public abstract class AbstractExecWarMoj
private File buildDirectory;
/**
- * @parameter default-value="src/main/tomcatconf"
expression="${tomcat.exec.war.tomcatConf}"
+ * @parameter default-value="src/main/tomcatconf"
expression="${maven.tomcat.exec.war.tomcatConf}"
*/
private File tomcatConfigurationFilesDirectory;
/**
- * @parameter default-value="src/main/tomcatconf/server.xml"
expression="${tomcat.exec.war.serverXml}"
+ * @parameter default-value="src/main/tomcatconf/server.xml"
expression="${maven.tomcat.exec.war.serverXml}"
*/
private File serverXml;
@@ -157,7 +158,23 @@ public abstract class AbstractExecWarMoj
* @readonly
* @required
*/
-protected List remoteRepos;
+protected List remoteRepos;
+
+/**
+ * @component
+ * @required
+ * @readonly
+ */
+private MavenProjectHelper projectHelper;
+
+/**
+ * The webapp context path to use for the web application being run.
+ * The name to store webapp in exec jar. Do not use /
+ *
+ * @parameter expression="${maven.tomcat.exec.war.attachArtifact}"
default-value="true"
+ * @required
+ */
+private boolean attachArtifact;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -314,6 +331,13 @@ public abstract class AbstractExecWarMoj
os.putArchiveEntry( new JarArchiveEntry( "META-INF/MANIFEST.MF" )
);
IOUtils.copy( new FileInputStream( tmpManifestFile ), os );
os.closeArchiveEntry();
+
+if ( attachArtifact )
+{
+// MavenProject project, File artifactFile, String
artifactClassifier
+// classifier configurable ?
+projectHelper.attachArtifact( project, execWarJar, "exec-war"
);
+}
} catch ( ManifestException e )
{
throw new MojoExecutionException( e.getMessage(), e );
@@ -327,10 +351,10 @@ public abstract class AbstractExecWarMoj
{
throw new MojoExecutionException( e.getMessage(), e );
} catch ( ArtifactResolutionException e )
-{
-throw new MojoExecutionException( e.getMessage(), e );
-
-} finally {
+{
+throw new MojoExecutionException( e.getMessage(), e );
+} finally
+{
IOUtils.closeQuietly( os );
IOUtils.closeQuietly( tmpManifestWriter );
IOUtils.closeQuietly( execWarJarOutputStream );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185053 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java tomcat7-war-runner/src/main/java/org/apache
Author: olamy
Date: Mon Oct 17 09:16:38 2011
New Revision: 1185053
URL: http://svn.apache.org/viewvc?rev=1185053&view=rev
Log:
[MTOMCAT-102] Add a mojo to build a standalone jar to run a web application:
make attach artifact classifier and type configurable
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/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.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=1185053&r1=1185052&r2=1185053&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 09:16:38 2011
@@ -168,13 +168,30 @@ public abstract class AbstractExecWarMoj
private MavenProjectHelper projectHelper;
/**
- * The webapp context path to use for the web application being run.
- * The name to store webapp in exec jar. Do not use /
+ * Attach or not the generated artifact to the build (use true if you want
to install or deploy it)
*
* @parameter expression="${maven.tomcat.exec.war.attachArtifact}"
default-value="true"
* @required
*/
private boolean attachArtifact;
+
+
+/**
+ * the classifier to use for the attached/generated artifact
+ *
+ * @parameter
expression="${maven.tomcat.exec.war.attachArtifactClassifier}"
default-value="exec-war"
+ * @required
+ */
+private String attachArtifactClassifier;
+
+
+/**
+ * the type to use for the attached/generated artifact
+ *
+ * @parameter expression="${maven.tomcat.exec.war.attachArtifactType}"
default-value="jar"
+ * @required
+ */
+private String attachArtifactClassifierType;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -334,9 +351,8 @@ public abstract class AbstractExecWarMoj
if ( attachArtifact )
{
-// MavenProject project, File artifactFile, String
artifactClassifier
-// classifier configurable ?
-projectHelper.attachArtifact( project, execWarJar, "exec-war"
);
+//MavenProject project, String artifactType, String
artifactClassifier, File artifactFile
+projectHelper.attachArtifact( project,
attachArtifactClassifierType, attachArtifactClassifier, execWarJar );
}
} catch ( ManifestException e )
{
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=1185053&r1=1185052&r2=1185053&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
Mon Oct 17 09:16:38 2011
@@ -72,7 +72,7 @@ public class Tomcat7RunnerCli
static Option debug = OptionBuilder
.withLongOpt( "debug" )
.withDescription("debug")
-.create("x");
+.create("X");
static Options options = new Options();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185174 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Author: olamy
Date: Mon Oct 17 14:01:57 2011
New Revision: 1185174
URL: http://svn.apache.org/viewvc?rev=1185174&view=rev
Log:
don't fail on passing system properties to the cli
Modified:
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/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=1185174&r1=1185173&r2=1185174&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
Mon Oct 17 14:01:57 2011
@@ -67,19 +67,25 @@ public class Tomcat7RunnerCli
static Option help = OptionBuilder
.withLongOpt( "help" )
.withDescription("help")
-.create("h");
+.create('h');
static Option debug = OptionBuilder
.withLongOpt( "debug" )
.withDescription("debug")
-.create("X");
+.create('X');
+
+static Option sysProps = OptionBuilder.withDescription( "use value for
given property" )
+.hasArgs()
+.withDescription("key=value")
+.withValueSeparator()
+.create( 'D' );
static Options options = new Options();
static
{
options.addOption( httpPort ).addOption( httpsPort ).addOption(
ajpPort ).addOption( serverXmlPath )
-.addOption( resetExtract ).addOption( help ).addOption( debug
);
+.addOption( resetExtract ).addOption( help ).addOption( debug
).addOption( sysProps );
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185175 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java
Author: olamy
Date: Mon Oct 17 14:02:26 2011
New Revision: 1185175
URL: http://svn.apache.org/viewvc?rev=1185175&view=rev
Log:
[MTOMCAT-102] correctly set sys props pass tru the cli
Modified:
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/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=1185175&r1=1185174&r2=1185175&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
Mon Oct 17 14:02:26 2011
@@ -29,6 +29,7 @@ import org.apache.commons.cli.ParseExcep
import java.io.IOException;
import java.io.InputStream;
+import java.util.Map;
import java.util.Properties;
/**
@@ -142,6 +143,19 @@ public class Tomcat7RunnerCli
{
tomcat7Runner.debug = true;
}
+
+if ( line.hasOption( sysProps.getOpt() ) )
+{
+Properties systemProperties = line.getOptionProperties(
sysProps.getOpt() );
+if ( systemProperties != null && !systemProperties.isEmpty() )
+{
+for ( Map.Entry sysProp :
systemProperties.entrySet() )
+{
+System.setProperty( (String) sysProp.getKey(), (String)
sysProp.getValue() );
+}
+}
+}
+
// here we go
tomcat7Runner.run();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185176 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ tomcat7-war-runner/ tomcat7-war-runner/src/main/java/org/apache/tom
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 || useSer
svn commit: r1185177 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ tomcat7-war-runner/ tomcat7-war-runner/src/main/java/org/apache/tom
Author: olamy
Date: Mon Oct 17 14:03:06 2011
New Revision: 1185177
URL: http://svn.apache.org/viewvc?rev=1185177&view=rev
Log:
[MTOMCAT-102] acces log valve format used configurable
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=1185177&r1=1185176&r2=1185177&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:03:06 2011
@@ -200,6 +200,14 @@ public abstract class AbstractExecWarMoj
* @required
*/
private boolean enableNaming;
+
+/**
+ * see http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html
+ *
+ * @parameter expression="${maven.tomcat.exec.war.accessLogValveFormat}"
default-value="%h %l %u %t "%r" %s %b %I %D"
+ * @required
+ */
+private String accessLogValveFormat;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -251,11 +259,15 @@ public abstract class AbstractExecWarMoj
// * 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 )
+// * accessLogValveFormat=
//* optionnal: conf/ with usual tomcat configuration files
//* MANIFEST with Main-Class
Properties properties = new Properties( );
+properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString(
enableNaming ) );
+properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY,
accessLogValveFormat );
+
os =
new
ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.JAR,
execWarJarOutputStream);
@@ -267,7 +279,7 @@ 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() ) )
{
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=1185177&r1=1185176&r2=1185177&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:03:06
2011
@@ -23,6 +23,7 @@ The generated standalone jar will contai
in the maven plugin configuration
* wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty
use the war name)
* enableNaming=true/false
+ * accessLogValveFormat=
* 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=1185177&r1=1185176&r2=1185177&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:03:06 2011
@@ -50,6 +50,8 @@ public class Tomcat7Runner
public static final String ENABLE_NAMING_KEY = "enableNaming";
+public static final String ACCESS_LOG_VALVE_FORMAT_KEY =
"accessLogValveFormat";
+
public int httpPort;
@@ -134,7 +136,7 @@ public class Tomcat7Runner
// add a default acces log valve
AccessLogValve alv = new AccessLogValve();
alv.setDirectory(new File(extractDirectory,
"logs").getAb
svn commit: r1185178 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon Oct 17 14:03:22 2011
New Revision: 1185178
URL: http://svn.apache.org/viewvc?rev=1185178&view=rev
Log:
[MTOMCAT-102] implements extraDependencies to be able to jdbc driver mail etc..
to the root classloader (ie including in the standalone jar)
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.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=1185178&r1=1185177&r2=1185178&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:03:22 2011
@@ -88,11 +88,6 @@ public abstract class AbstractExecWarMoj
private List pluginArtifacts;
/**
- * @parameter
- */
-private List extraDependencies;
-
-/**
* @parameter default-value="${project.build.directory}"
*/
private File buildDirectory;
@@ -208,6 +203,13 @@ public abstract class AbstractExecWarMoj
* @required
*/
private String accessLogValveFormat;
+
+/**
+ * list of extra dependencies to add in the standalone tomcat jar: your
jdbc driver, mail.jar etc..
+ * Those dependencies will be in root classloader.
+ * @parameter
+ */
+private List extraDependencies;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -357,6 +359,31 @@ public abstract class AbstractExecWarMoj
}
}
}
+
+// add extra dependencies
+if ( extraDependencies != null && !extraDependencies.isEmpty() )
+{
+for ( Dependency dependency : extraDependencies )
+{
+// String groupId, String artifactId, String version,
String scope, String type
+Artifact artifact =
+artifactFactory.createArtifact(
dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(),
dependency.getScope(), dependency.getType() );
+
+artifactResolver.resolve( artifact, this.remoteRepos ,
this.local );
+JarFile jarFile = new JarFile( artifact.getFile() );
+Enumeration jarEntries = jarFile.entries();
+while ( jarEntries.hasMoreElements() )
+{
+JarEntry jarEntry = jarEntries.nextElement();
+InputStream jarEntryIs =
jarFile.getInputStream(jarEntry);
+
+os.putArchiveEntry( new JarArchiveEntry(
jarEntry.getName() ) );
+IOUtils.copy( jarEntryIs, os );
+os.closeArchiveEntry();
+}
+}
+}
+
Manifest manifest = new Manifest( );
Manifest.Attribute mainClassAtt = new Manifest.Attribute( );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185180 - in /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run: AbstractExecWarMojo.java WarRunDependency.java
Author: olamy
Date: Mon Oct 17 14:03:38 2011
New Revision: 1185180
URL: http://svn.apache.org/viewvc?rev=1185180&view=rev
Log:
[MTOMCAT-102] option to add dynamically a context.xml to a war before packaging
it
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-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/WarRunDependency.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=1185180&r1=1185179&r2=1185180&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:03:38 2011
@@ -45,9 +45,11 @@ import org.codehaus.plexus.archiver.jar.
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.OutputStream;
import java.io.PrintWriter;
import java.util.Enumeration;
import java.util.List;
@@ -271,12 +273,12 @@ public abstract class AbstractExecWarMoj
properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY,
accessLogValveFormat );
os =
-new
ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.JAR,
execWarJarOutputStream);
+new ArchiveStreamFactory().createArchiveOutputStream(
ArchiveStreamFactory.JAR, execWarJarOutputStream );
if ( "war".equals( project.getPackaging() ) )
{
os.putArchiveEntry( new JarArchiveEntry( path + ".war" ) );
-IOUtils.copy( new FileInputStream(projectArtifact.getFile()),
os );
+IOUtils.copy( new FileInputStream( projectArtifact.getFile()
), os );
os.closeArchiveEntry();
properties.put( Tomcat7Runner.WARS_KEY , path + ".war|" + path
);
}
@@ -295,8 +297,13 @@ public abstract class AbstractExecWarMoj
artifactFactory.createArtifact(
dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(),
dependency.getScope(), dependency.getType() );
artifactResolver.resolve( artifact, this.remoteRepos ,
this.local );
-os.putArchiveEntry( new JarArchiveEntry(
artifact.getFile().getName() ) );
-IOUtils.copy( new FileInputStream(artifact.getFile()),
os );
+File warFile = artifact.getFile();
+if ( warRunDependency.contextXml != null )
+{
+addContextXmlToWar( warRunDependency.contextXml,
warFile );
+}
+os.putArchiveEntry( new JarArchiveEntry(
warFile.getName() ) );
+IOUtils.copy( new FileInputStream( warFile ), os );
os.closeArchiveEntry();
String propertyWarValue = properties.getProperty(
Tomcat7Runner.WARS_KEY );
// FIXME check contextPath is not empty or at least
only / for root app
@@ -424,7 +431,28 @@ public abstract class AbstractExecWarMoj
IOUtils.closeQuietly( os );
IOUtils.closeQuietly( tmpManifestWriter );
IOUtils.closeQuietly( execWarJarOutputStream );
-IOUtils.closeQuietly(tmpPropertiesFileOutputStream);
+IOUtils.closeQuietly( tmpPropertiesFileOutputStream );
+}
+}
+
+
+private void addContextXmlToWar(File contextXmlFile, File warFile)
+throws IOException, ArchiveException
+{
+ArchiveOutputStream os = null;
+OutputStream warOutputStream = null;
+try
+{
+warOutputStream = new FileOutputStream( warFile );
+os =
+new ArchiveStreamFactory().createArchiveOutputStream(
ArchiveStreamFactory.JAR, warOutputStream );
+os.putArchiveEntry( new JarArchiveEntry( "META-INF/context.xml" )
);
+IOUtils.copy( new FileInputStream( contextXmlFile ), os );
+os.closeArchiveEntry();
+} finally
+{
+IOUtils.closeQuietly( os );
+IOUtils.closeQuietly( warOutputStream );
}
}
}
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/
svn commit: r1185181 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon Oct 17 14:03:53 2011
New Revision: 1185181
URL: http://svn.apache.org/viewvc?rev=1185181&view=rev
Log:
[MTOMCAT-102] main class configurable
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.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=1185181&r1=1185180&r2=1185181&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:03:53 2011
@@ -212,7 +212,15 @@ public abstract class AbstractExecWarMoj
* @parameter
*/
private List extraDependencies;
-
+
+/**
+ * Main class to use for starting the standalone jar.
+ *
+ * @parameter expression="${maven.tomcat.exec.war.mainClass}"
default-value="org.apache.tomcat.maven.runner.Tomcat7RunnerCli"
+ * @required
+ */
+private String mainClass;
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -395,7 +403,7 @@ public abstract class AbstractExecWarMoj
Manifest.Attribute mainClassAtt = new Manifest.Attribute( );
mainClassAtt.setName( "Main-Class");
-mainClassAtt.setValue( Tomcat7RunnerCli.class.getName() );
+mainClassAtt.setValue( mainClass );
manifest.addConfiguredAttribute( mainClassAtt );
manifest.write( tmpManifestWriter );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185182 - in /tomcat/maven-plugin/trunk/src/site: apt/executable-war-jar.apt.vm site.xml
Author: olamy
Date: Mon Oct 17 14:04:08 2011
New Revision: 1185182
URL: http://svn.apache.org/viewvc?rev=1185182&view=rev
Log:
start adding documentation on executable war/jar feature.
Added:
tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm (with
props)
Modified:
tomcat/maven-plugin/trunk/src/site/site.xml
Added: tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm?rev=1185182&view=auto
==
--- tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm (added)
+++ tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm Mon Oct 17
14:04:08 2011
@@ -0,0 +1,162 @@
+ ---
+ Executable War
+ ---
+ Olivier Lamy
+ ---
+ October 17, 2011
+ ---
+
+ ~~ 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
+
+Build a Executable War
+
+ Prior to version 2.0, you can now build an executable war/jar with an embeded
Apache Tomcat7.
+
+ This is only supported with the tomcat7 plugin.
+
+* Additionnal Artifact to your war module
+
++--
+
+ ...
+ war
+ ...
+
+...
+
+ ...
+
+org.apache.tomcat.maven
+tomcat7-maven-plugin
+${project.version}
+
+
+tomcat-run
+
+ exec-war-only
+
+package
+
+ foo
+
+ src/main/tomcatconf/server.xml
+
+ default value is exec-war but you can
customize
+ default value is
jar
+
+
+
+
+ ...
+
+...
+
+ ...
+
++--
+
+* Additionnal Artifact to your pom module
+
++--
+
+ ...
+ war
+ ...
+
+...
+
+ ...
+
+org.apache.tomcat.maven
+tomcat7-maven-plugin
+${project.version}
+
+
+tomcat-run
+
+ exec-war-only
+
+package
+
+
+
+
+
+
+a groupId
+and artifactId
+version
+war
+
+ /
+
+
+
+ true
+
+
+
+ org.apache.derby
+ derby
+ 10.1.3.1
+
+
+ javax.mail
+ mail
+ 1.4
+
+
+
+
+
+
+ ...
+
+...
+
+ ...
+
++--
+
+* Generated executable jar/war
+
+ You will be able to execute the generated jar which contains an embeded
tomcat container
+
++--
+ java -jar yourjar
++--
+
+ Help output
+
++--
+usage: java -jar [path to your exec war jar]
+ -ajpPortajp port to use
+ -D key=value
+ -h,--helphelp
+ -httpPort http port to use
+ -httpsPorthttps port to use
+ -resetExtractclean previous extract directory
+ -serverXmlPathserver.xml to use, optionnal
+ -X,--debug debug
++--
+
Propchange: tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm
--
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/src/site/apt/executable-war-jar.apt.vm
--
svn:keywords = Author Date Id Revision
Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1185182&r1=1185181&r2=1185182&view=diff
==
--- tomcat/maven-
svn commit: r1185342 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon Oct 17 19:58:19 2011
New Revision: 1185342
URL: http://svn.apache.org/viewvc?rev=1185342&view=rev
Log:
[MTOMCAT-102] do not alterate the artifact installed locally when adding a
context.xml file.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.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=1185342&r1=1185341&r2=1185342&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 19:58:19 2011
@@ -22,6 +22,7 @@ import org.apache.commons.compress.archi
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.jar.JarArchiveEntry;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
@@ -302,7 +303,8 @@ public abstract class AbstractExecWarMoj
dependency.getType() );
artifactResolver.resolve( artifact, this.remoteRepos,
this.local );
-File warFile = artifact.getFile();
+File warFile = new File( buildDirectory,
artifact.getFile().getName() );
+FileUtils.copyFile( artifact.getFile(), warFile );
if ( warRunDependency.contextXml != null )
{
addContextXmlToWar( warRunDependency.contextXml,
warFile );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185343 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon Oct 17 19:58:35 2011
New Revision: 1185343
URL: http://svn.apache.org/viewvc?rev=1185343&view=rev
Log:
[MTOMCAT-102] fix creation of war when adding META-INF/context.xml
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.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=1185343&r1=1185342&r2=1185343&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 19:58:35 2011
@@ -304,12 +304,13 @@ public abstract class AbstractExecWarMoj
artifactResolver.resolve( artifact, this.remoteRepos,
this.local );
File warFile = new File( buildDirectory,
artifact.getFile().getName() );
+String warFileName = artifact.getFile().getName();
FileUtils.copyFile( artifact.getFile(), warFile );
if ( warRunDependency.contextXml != null )
{
-addContextXmlToWar( warRunDependency.contextXml,
warFile );
+warFile = addContextXmlToWar(
warRunDependency.contextXml, warFile );
}
-os.putArchiveEntry( new JarArchiveEntry(
warFile.getName() ) );
+os.putArchiveEntry( new JarArchiveEntry( warFileName )
);
IOUtils.copy( new FileInputStream( warFile ), os );
os.closeArchiveEntry();
String propertyWarValue = properties.getProperty(
Tomcat7Runner.WARS_KEY );
@@ -453,23 +454,41 @@ public abstract class AbstractExecWarMoj
}
-private void addContextXmlToWar( File contextXmlFile, File warFile )
+/**
+ * return file can be deleted
+ */
+private File addContextXmlToWar( File contextXmlFile, File warFile )
throws IOException, ArchiveException
{
ArchiveOutputStream os = null;
OutputStream warOutputStream = null;
+File tmpWar = File.createTempFile( "tomcat", "war-exec" );
+tmpWar.deleteOnExit();
+
try
{
-warOutputStream = new FileOutputStream( warFile );
+warOutputStream = new FileOutputStream( tmpWar );
os = new ArchiveStreamFactory().createArchiveOutputStream(
ArchiveStreamFactory.JAR, warOutputStream );
os.putArchiveEntry( new JarArchiveEntry( "META-INF/context.xml" )
);
IOUtils.copy( new FileInputStream( contextXmlFile ), os );
os.closeArchiveEntry();
+
+JarFile jarFile = new JarFile( warFile );
+Enumeration jarEntries = jarFile.entries();
+while ( jarEntries.hasMoreElements() )
+{
+JarEntry jarEntry = jarEntries.nextElement();
+os.putArchiveEntry( new JarArchiveEntry( jarEntry.getName() )
);
+IOUtils.copy( jarFile.getInputStream( jarEntry ), os );
+os.closeArchiveEntry();
+}
+os.flush();
}
finally
{
IOUtils.closeQuietly( os );
IOUtils.closeQuietly( warOutputStream );
}
+return tmpWar;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185344 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Author: olamy
Date: Mon Oct 17 19:58:55 2011
New Revision: 1185344
URL: http://svn.apache.org/viewvc?rev=1185344&view=rev
Log:
fix code formatting
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.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=1185344&r1=1185343&r2=1185344&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 19:58:55 2011
@@ -24,7 +24,11 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.valves.AccessLogValve;
import org.apache.tomcat.util.http.fileupload.FileUtils;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -37,7 +41,8 @@ import java.util.StringTokenizer;
* @author Olivier Lamy
* @since 2.0
*/
-public class Tomcat7Runner {
+public class Tomcat7Runner
+{
// true/false to use the server.xml located in the jar /conf/server.xml
public static final String USE_SERVER_XML_KEY = "useServerXml";
@@ -72,65 +77,80 @@ public class Tomcat7Runner {
/**
* key = context of the webapp, value = war path on file system
*/
-Map webappWarPerContext = new HashMap( );
+Map webappWarPerContext = new HashMap();
-public Tomcat7Runner () {
+public Tomcat7Runner()
+{
// no op
}
-public void run ()
-throws Exception {
+public void run()
+throws Exception
+{
// do we have to extract content
-if ( !new File( ".extract" ).exists( ) || resetExtract ) {
-extract( );
+if ( !new File( ".extract" ).exists() || resetExtract )
+{
+extract();
+}
+else
+{
+String wars = runtimeProperties.getProperty( WARS_KEY );
+populateWebAppWarPerContext( wars );
}
-System.setProperty( "catalina.base", extractDirectory.getAbsolutePath(
) );
-System.setProperty( "catalina.home", extractDirectory.getAbsolutePath(
) );
-
+System.setProperty( "catalina.base",
extractDirectory.getAbsolutePath() );
+System.setProperty( "catalina.home",
extractDirectory.getAbsolutePath() );
// start with a server.xml
-if ( serverXmlPath != null || useServerXml( ) ) {
-container = new Catalina( );
-container.setUseNaming( this.enableNaming( ) );
-if ( serverXmlPath != null && new File( serverXmlPath ).exists( )
) {
+if ( serverXmlPath != null || useServerXml() )
+{
+container = new Catalina();
+container.setUseNaming( this.enableNaming() );
+if ( serverXmlPath != null && new File( serverXmlPath ).exists() )
+{
container.setConfig( serverXmlPath );
-} else {
-container.setConfig( new File( extractDirectory,
"conf/server.xml" ).getAbsolutePath( ) );
}
-container.start( );
-} else {
-tomcat = new Tomcat( );
+else
+{
+container.setConfig( new File( extractDirectory,
"conf/server.xml" ).getAbsolutePath() );
+}
+container.start();
+}
+else
+{
+tomcat = new Tomcat();
-if ( this.enableNaming( ) ) {
-tomcat.enableNaming( );
+if ( this.enableNaming() )
+{
+tomcat.enableNaming();
}
-tomcat.getHost( ).setAppBase( new File( extractDirectory,
"webapps" ).getAbsolutePath( ) );
+tomcat.getHost().setAppBase( new File( extractDirectory, "webapps"
).getAbsolutePath() );
Connector connector = new Connector( "HTTP/1.1" );
connector.setPort( httpPort );
-if ( httpsPort > 0 ) {
+if ( httpsPort > 0 )
+{
connector.setRedirectPort( httpsPort );
}
// FIXME parameter for that def ? ISO-8859-1
//connector.setURIEncoding(uriEncoding);
-tomcat.getService( ).addConnector( connector );
+tomcat.getService().addConnector( conn
svn commit: r1185345 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java tomcat7-war-runner/src/main/java/org/apache
Author: olamy
Date: Mon Oct 17 19:59:13 2011
New Revision: 1185345
URL: http://svn.apache.org/viewvc?rev=1185345&view=rev
Log:
[MTOMCAT-102] restart without resetting extract directory was failing
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/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=1185345&r1=1185344&r2=1185345&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 19:59:13 2011
@@ -318,13 +318,13 @@ public abstract class AbstractExecWarMoj
if ( propertyWarValue != null )
{
properties.put( Tomcat7Runner.WARS_KEY,
-propertyWarValue + ";" +
artifact.getFile().getName() + "|"
+propertyWarValue + ";" +
warFileName + "|"
+ warRunDependency.contextPath
);
}
else
{
properties.put( Tomcat7Runner.WARS_KEY,
-artifact.getFile().getName() + "|"
+ warRunDependency.contextPath );
+warFileName + "|" +
warRunDependency.contextPath );
}
}
}
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=1185345&r1=1185344&r2=1185345&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 19:59:13 2011
@@ -99,6 +99,16 @@ public class Tomcat7Runner
populateWebAppWarPerContext( wars );
}
+// create tomcat various paths
+new File( extractDirectory, "conf" ).mkdirs();
+new File( extractDirectory, "logs" ).mkdirs();
+new File( extractDirectory, "webapps" ).mkdirs();
+new File( extractDirectory, "work" ).mkdirs();
+File tmpDir = new File( extractDirectory, "temp" );
+tmpDir.mkdirs();
+
+System.setProperty( "java.io.tmpdir", tmpDir.getAbsolutePath() );
+
System.setProperty( "catalina.base",
extractDirectory.getAbsolutePath() );
System.setProperty( "catalina.home",
extractDirectory.getAbsolutePath() );
@@ -240,11 +250,9 @@ public class Tomcat7Runner
}
extractDirectory.mkdirs();
-// create tomcat various paths
-new File( extractDirectory, "conf" ).mkdirs();
-new File( extractDirectory, "logs" ).mkdirs();
+
+// ensure webapp dir is here
new File( extractDirectory, "webapps" ).mkdirs();
-new File( extractDirectory, "work" ).mkdirs();
String wars = runtimeProperties.getProperty( WARS_KEY );
populateWebAppWarPerContext( wars );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1185743 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Author: olamy
Date: Tue Oct 18 16:32:23 2011
New Revision: 1185743
URL: http://svn.apache.org/viewvc?rev=1185743&view=rev
Log:
[MTOMCAT-102] if there a context.xml in the war META-INF/context.xml use it for
the context.
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.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=1185743&r1=1185742&r2=1185743&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
Tue Oct 18 16:32:23 2011
@@ -18,17 +18,20 @@ package org.apache.tomcat.maven.runner;
* under the License.
*/
+import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Catalina;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.tomcat.util.http.fileupload.FileUtils;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -133,6 +136,7 @@ public class Tomcat7Runner
if ( this.enableNaming() )
{
+System.setProperty( "catalina.useNaming", "true" );
tomcat.enableNaming();
}
@@ -190,17 +194,21 @@ public class Tomcat7Runner
// add webapps
for ( Map.Entry entry :
this.webappWarPerContext.entrySet() )
{
+String baseDir = null;
if ( entry.getKey().equals( "/" ) )
{
-tomcat.addWebapp( entry.getKey(),
- new File( extractDirectory,
"webapps/ROOT.war" ).getAbsolutePath() );
+baseDir = new File( extractDirectory, "webapps/ROOT.war"
).getAbsolutePath();
}
else
{
-tomcat.addWebapp( entry.getKey(),
- new File( extractDirectory, "webapps/" +
entry.getValue() ).getAbsolutePath() );
+baseDir = new File( extractDirectory, "webapps/" +
entry.getValue() ).getAbsolutePath();
+}
+Context context = tomcat.addWebapp( entry.getKey(), baseDir );
+URL contextFileUrl = getContextXml( baseDir );
+if ( contextFileUrl != null )
+{
+context.setConfigFile( contextFileUrl );
}
-
}
tomcat.start();
@@ -210,6 +218,28 @@ public class Tomcat7Runner
}
+private URL getContextXml( String warPath )
+throws IOException
+{
+InputStream inputStream = null;
+try
+{
+URL url = new URL( "jar:file:" + warPath +
"!/META-INF/context.xml" );
+inputStream = url.openConnection().getInputStream();
+if ( inputStream != null )
+{
+return url;
+}
+}
+finally
+{
+IOUtils.closeQuietly( inputStream );
+}
+return null;
+}
+
+//protected WebappLoader createWebappLoader()
+
private void waitIndefinitely()
{
Object lock = new Object();
@@ -250,7 +280,6 @@ public class Tomcat7Runner
}
extractDirectory.mkdirs();
-
// ensure webapp dir is here
new File( extractDirectory, "webapps" ).mkdirs();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186891 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Author: olamy
Date: Thu Oct 20 16:30:28 2011
New Revision: 1186891
URL: http://svn.apache.org/viewvc?rev=1186891&view=rev
Log:
[MTOMCAT-102] not fail if META-INF/context.xml is not here
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.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=1186891&r1=1186890&r2=1186891&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
Thu Oct 20 16:30:28 2011
@@ -28,6 +28,7 @@ import org.apache.tomcat.util.http.fileu
import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -231,6 +232,10 @@ public class Tomcat7Runner
return url;
}
}
+catch ( FileNotFoundException e )
+{
+return null;
+}
finally
{
IOUtils.closeQuietly( inputStream );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187230 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tom
Author: olamy
Date: Fri Oct 21 09:15:03 2011
New Revision: 1187230
URL: http://svn.apache.org/viewvc?rev=1187230&view=rev
Log:
[MTOMCAT-77] Add support for using the test classpath instead of the compile
classpath with tomcat:run.
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java?rev=1187230&r1=1187229&r2=1187230&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
Fri Oct 21 09:15:03 2011
@@ -38,6 +38,8 @@ public class ClassLoaderEntriesCalculato
private boolean addWarDependenciesInClassloader;
+private boolean useTestClassPath;
+
public MavenProject getMavenProject()
{
return mavenProject;
@@ -82,4 +84,15 @@ public class ClassLoaderEntriesCalculato
this.addWarDependenciesInClassloader = addWarDependenciesInClassloader;
return this;
}
+
+public boolean isUseTestClassPath()
+{
+return useTestClassPath;
+}
+
+public ClassLoaderEntriesCalculatorRequest setUseTestClassPath( boolean
useTestClassPath )
+{
+this.useTestClassPath = useTestClassPath;
+return this;
+}
}
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187230&r1=1187229&r2=1187230&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Fri Oct 21 09:15:03 2011
@@ -61,8 +61,9 @@ public class DefaultClassLoaderEntriesCa
try
{
-@SuppressWarnings( "unchecked" ) List classPathElements =
-request.getMavenProject().getCompileClasspathElements();
+@SuppressWarnings( "unchecked" ) List classPathElements =
request.isUseTestClassPath()
+? request.getMavenProject().getTestClasspathElements()
+: request.getMavenProject().getCompileClasspathElements();
if ( classPathElements != null )
{
for ( String classPathElement : classPathElements )
@@ -90,7 +91,8 @@ public class DefaultClassLoaderEntriesCa
String scope = artifact.getScope();
// skip provided and test scoped artifacts
-if ( !Artifact.SCOPE_PROVIDED.equals( scope ) &&
!Artifact.SCOPE_TEST.equals( scope ) )
+if ( !Artifact.SCOPE_PROVIDED.equals( scope ) && (
!Artifact.SCOPE_TEST.equals( scope )
+|| request.isUseTestClassPath() ) )
{
request.getLog().debug(
"add dependency to webapploader " +
artifact.getGroupId() + ":" + artifact.getArtifactId() + ":"
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1187230&r1=1187229&r2=1187230&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache
svn commit: r1187231 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/
Author: olamy
Date: Fri Oct 21 09:15:22 2011
New Revision: 1187231
URL: http://svn.apache.org/viewvc?rev=1187231&view=rev
Log:
[MTOMCAT-95] Add directories to the embedded tomcat classloader (equivalent to
shared.loader property in regular tomcat instance).
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1187231&r1=1187230&r2=1187231&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
Fri Oct 21 09:15:22 2011
@@ -116,6 +116,14 @@ public class RunMojo
*/
private boolean useTestClasspath;
+/**
+ * Additional optional directories to add to the embedded tomcat classpath.
+ *
+ * @parameter alias = "additionalClassesDirs"
+ * @since 2.0
+ */
+private List additionalClasspathDirs;
+
private File temporaryContextFile = null;
// --
@@ -168,6 +176,16 @@ public class RunMojo
loader.addRepository( classLoaderEntry );
}
}
+if ( additionalClasspathDirs != null &&
!additionalClasspathDirs.isEmpty() )
+{
+for ( File additionalClasspathDir : additionalClasspathDirs )
+{
+if ( additionalClasspathDir.exists() )
+{
+loader.addRepository(
additionalClasspathDir.toURI().toString() );
+}
+}
+}
}
catch ( TomcatRunException e )
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1187231&r1=1187230&r2=1187231&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Fri Oct 21 09:15:22 2011
@@ -112,6 +112,14 @@ public class RunMojo
*/
private boolean useTestClasspath;
+/**
+ * Additional optional directories to add to the embedded tomcat classpath.
+ *
+ * @parameter alias = "additionalClassesDirs"
+ * @since 2.0
+ */
+private List additionalClasspathDirs;
+
private File temporaryContextFile = null;
/**
@@ -228,6 +236,17 @@ public class RunMojo
loader.addRepository( classLoaderEntry );
}
}
+
+if ( additionalClasspathDirs != null &&
!additionalClasspathDirs.isEmpty() )
+{
+for ( File additionalClasspathDir : additionalClasspathDirs )
+{
+if ( additionalClasspathDir.exists() )
+{
+loader.addRepository(
additionalClasspathDir.toURI().toString() );
+}
+}
+}
}
catch ( TomcatRunException e )
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187232 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy
Date: Fri Oct 21 09:15:37 2011
New Revision: 1187232
URL: http://svn.apache.org/viewvc?rev=1187232&view=rev
Log:
prefer Set to prevent duplicate entries
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187232&r1=1187231&r2=1187232&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Fri Oct 21 09:15:37 2011
@@ -38,7 +38,9 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* @author Olivier Lamy
@@ -56,7 +58,8 @@ public class DefaultClassLoaderEntriesCa
public List calculateClassPathEntries(
ClassLoaderEntriesCalculatorRequest request )
throws TomcatRunException
{
-List classLoaderEntries = new ArrayList();
+Set classLoaderEntries = new HashSet();
+//List classLoaderEntries = new ArrayList( );
// add classes directories to loader
try
@@ -158,7 +161,8 @@ public class DefaultClassLoaderEntriesCa
}
}
}
-return classLoaderEntries;
+return new ArrayList( classLoaderEntries );
+//return classLoaderEntries;
}
private void deleteDirectory( File directory, Log log )
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187233 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy
Date: Fri Oct 21 09:15:52 2011
New Revision: 1187233
URL: http://svn.apache.org/viewvc?rev=1187233&view=rev
Log:
cleanup commented code
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187233&r1=1187232&r2=1187233&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Fri Oct 21 09:15:52 2011
@@ -59,9 +59,8 @@ public class DefaultClassLoaderEntriesCa
throws TomcatRunException
{
Set classLoaderEntries = new HashSet();
-//List classLoaderEntries = new ArrayList( );
-// add classes directories to loader
+// add classes directories to loader
try
{
@SuppressWarnings( "unchecked" ) List classPathElements =
request.isUseTestClassPath()
@@ -162,7 +161,6 @@ public class DefaultClassLoaderEntriesCa
}
}
return new ArrayList( classLoaderEntries );
-//return classLoaderEntries;
}
private void deleteDirectory( File directory, Log log )
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187271 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy
Date: Fri Oct 21 10:00:29 2011
New Revision: 1187271
URL: http://svn.apache.org/viewvc?rev=1187271&view=rev
Log:
use LinkedHashSet to preserve order
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1187271&r1=1187270&r2=1187271&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Fri Oct 21 10:00:29 2011
@@ -38,7 +38,7 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -58,7 +58,7 @@ public class DefaultClassLoaderEntriesCa
public List calculateClassPathEntries(
ClassLoaderEntriesCalculatorRequest request )
throws TomcatRunException
{
-Set classLoaderEntries = new HashSet();
+Set classLoaderEntries = new LinkedHashSet();
// add classes directories to loader
try
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187561 [2/2] - in /tomcat/tc7.0.x/trunk: ./ maven/ maven/tomcat-annotations-api/ maven/tomcat-api/ maven/tomcat-catalina-ant/ maven/tomcat-catalina-ha/ maven/tomcat-catalina-jmx-remote/
Added: tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml?rev=1187561&view=auto
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml (added)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml Fri Oct 21 21:41:30 2011
@@ -0,0 +1,76 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.tomcat
+tomcat-parent
+7.0.23-SNAPSHOT
+
+ tomcat-jsp-api
+
+ JSP package
+
+
+ org.apache.tomcat
+ tomcat-el-api
+ ${project.version}
+ compile
+
+
+ org.apache.tomcat
+ tomcat-servlet-api
+ ${project.version}
+ compile
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+copy_java_files
+generate-sources
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
+
Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml
--
svn:eol-style = native
Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml
--
svn:keywords = Author Date Id Revision
Added: tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml?rev=1187561&view=auto
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml (added)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml Fri Oct 21 21:41:30 2011
@@ -0,0 +1,62 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.tomcat
+tomcat-parent
+7.0.23-SNAPSHOT
+
+
+ tomcat-juli
+
+ Tomcat Core Logging Package
+
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+copy_java_files
+generate-sources
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml
--
svn:eol-style = native
Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml
--
svn:keywords = Author Date Id Revision
Added: tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml?rev=1187561&view=auto
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml (added)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml Fri Oct 21 21:41:30 2011
@@ -0,0 +1,61 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.tomcat
+tomcat-parent
+7.0.23-SNAPSHOT
+
+ tomcat-mail-api
+
+ javax.mail package
+
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+copy_java_files
+generate-sources
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml
--
svn:eol-style = native
Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml
--
svn:keywords = Author Date Id Revision
Added: tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml?rev=1187561&view=auto
===
svn commit: r1187571 - /tomcat/tc7.0.x/trunk/.gitignore
Author: olamy Date: Fri Oct 21 21:59:52 2011 New Revision: 1187571 URL: http://svn.apache.org/viewvc?rev=1187571&view=rev Log: add a basic .gitignore Added: tomcat/tc7.0.x/trunk/.gitignore Added: tomcat/tc7.0.x/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/.gitignore?rev=1187571&view=auto == --- tomcat/tc7.0.x/trunk/.gitignore (added) +++ tomcat/tc7.0.x/trunk/.gitignore Fri Oct 21 21:59:52 2011 @@ -0,0 +1,6 @@ +target +output +build.properties +work +logs +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187576 - in /tomcat/tc7.0.x/trunk/maven: ./ tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-catalina-ws/ tomcat-catalina/
Author: olamy Date: Fri Oct 21 22:10:39 2011 New Revision: 1187576 URL: http://svn.apache.org/viewvc?rev=1187576&view=rev Log: ignore target directory in the maven build Modified: tomcat/tc7.0.x/trunk/maven/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-coyote/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-el-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-jasper/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-extras-juli-adapters/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-i18n-es/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-i18n-fr/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-i18n-ja/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-jasper/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-jasper-el/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-juli/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-tests/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-tribes/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-util/ (props changed) Propchange: tomcat/tc7.0.x/trunk/maven/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-api/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-coyote/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-el-api/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-embed-jasper/ -- --- svn:ignore (added) +++ svn:ignore Fri Oct 21 22:10:39 2011 @@ -0,0 +1 @@ +target Propchange: tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-
svn commit: r1187590 - in /tomcat/tc7.0.x/trunk/maven: tomcat-catalina-ha/pom.xml tomcat-catalina/pom.xml tomcat-coyote/pom.xml tomcat-el-api/pom.xml tomcat-jasper/pom.xml tomcat-servlet-api/pom.xml t
Author: olamy Date: Fri Oct 21 23:06:26 2011 New Revision: 1187590 URL: http://svn.apache.org/viewvc?rev=1187590&view=rev Log: fix inclusion of some default *.properties files Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Fri Oct 21 23:06:26 2011 @@ -63,8 +63,17 @@ + + + +../../java/ + + org/apache/catalina/ha/**/LocalStrings.properties + + + + - org.apache.maven.plugins maven-antrun-plugin Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml Fri Oct 21 23:06:26 2011 @@ -75,6 +75,15 @@ + + +../../java/ + + org/apache/catalina/**/LocalStrings.properties + org/apache/naming/**/LocalStrings.properties + + + Modified: tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml Fri Oct 21 23:06:26 2011 @@ -44,8 +44,24 @@ + + + +../../java/ + + org/apache/coyote/**/LocalStrings.properties + org/apache/util/**/LocalStrings.properties + org/apache/catalina/util/CharsetMapperDefault.properties + + + org/apache/util/file/** + org/apache/util/res/** + org/apache/util/scan/** + + + + - org.apache.maven.plugins maven-antrun-plugin Modified: tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml Fri Oct 21 23:06:26 2011 @@ -31,6 +31,14 @@ Expression language package + + +../../java/ + + javax/el/**/LocalStrings.properties + + + @@ -59,4 +67,5 @@ + Modified: tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml Fri Oct 21 23:06:26 2011 @@ -87,8 +87,17 @@ + + + +../../java/ + + org/apache/jasper/**/LocalStrings.properties + + + + - org.apache.maven.plugins maven-antrun-plugin Modified: tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml Fri Oct 21 23:06:26 2011 @@ -31,6 +31,14 @@ javax.servlet package + + +../../java/ + + javax/servlet/**/LocalStrings.properties + + + Modified: tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml?rev=1187590&r1=1187589&r2=1187590&view=diff =
svn commit: r1187665 - in /tomcat/tc7.0.x/trunk/maven: tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-catalina-ws/ tomcat-catalina/ tom
Author: olamy Date: Sat Oct 22 07:22:29 2011 New Revision: 1187665 URL: http://svn.apache.org/viewvc?rev=1187665&view=rev Log: not delete copied sources for all builds Modified: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-extras-juli-adapters/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-jasper-el/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-tests/ (props changed) tomcat/tc7.0.x/trunk/maven/tomcat-tribes/pom.xml tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml Modified: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml Sat Oct 22 07:22:29 2011 @@ -43,7 +43,6 @@ generate-sources - Modified: tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml Sat Oct 22 07:22:29 2011 @@ -49,7 +49,6 @@ generate-sources - Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml Sat Oct 22 07:22:29 2011 @@ -64,7 +64,6 @@ generate-sources - Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Sat Oct 22 07:22:29 2011 @@ -83,7 +83,6 @@ generate-sources - Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml Sat Oct 22 07:22:29 2011 @@ -62,7 +62,6 @@ generate-sources - Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml Sat Oct 22 07:22:29 2011 @@ -68,7 +68,6 @@ generate-sources -
svn commit: r1187667 - in /tomcat/tc7.0.x/trunk/maven: tomcat-dbcp/pom.xml tomcat-embed-logging-log4j/pom.xml
Author: olamy
Date: Sat Oct 22 07:28:39 2011
New Revision: 1187667
URL: http://svn.apache.org/viewvc?rev=1187667&view=rev
Log:
import external sources only if not exits: build speed improve when not using
clean
Modified:
tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml?rev=1187667&r1=1187666&r2=1187667&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml Sat Oct 22 07:28:39 2011
@@ -55,82 +55,91 @@
-
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-2.3
-
-
-unpack-commons-deps
-generate-sources
-
- unpack
-
-
-
-
- commons-dbcp
- commons-dbcp
- 1.4
- sources
- jar
- false
- **/*.java
- **/test/**
-
-
- commons-pool
- commons-pool
- 1.5.6
- sources
- jar
- false
- **/*.java
- **/test/**,**/managed/**
-
-
- ${tomcat-dbcp.home}/src/java
- false
- true
-
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-transform_to_tomcat_packages
-process-sources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
-
-
-
-
+
+
+ import-commons-sources
+
+
+ ${basedir}/src/main/java/org/apache/tomcat/dbcp
+
+
+
+
+
+org.apache.maven.plugins
+maven-dependency-plugin
+2.3
+
+
+unpack-commons-deps
+generate-sources
+
+ unpack
+
+
+
+
+ commons-dbcp
+ commons-dbcp
+ 1.4
+ sources
+ jar
+ false
+ **/*.java
+ **/test/**
+
+
+ commons-pool
+ commons-pool
+ 1.5.6
+ sources
+ jar
+ false
+ **/*.java
+ **/test/**,**/managed/**
+
+
+
${tomcat-dbcp.home}/src/java
+ true
+ true
+
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+
+
+transform_to_tomcat_packages
+process-sources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
+
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml?rev=1187667&r1=1187666&r2=1187667&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml Sat Oct 22
07:28:39 2011
@@ -67,67 +67,84 @@
-
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-2.3
-
-
-unpack-commons-deps
-generate-sources
-
- unpack
-
-
-
-
- commons-logging
- commons-logging
- 1.1.
svn commit: r1187740 - in /tomcat/trunk: ./ .gitignore
Author: olamy Date: Sat Oct 22 17:49:29 2011 New Revision: 1187740 URL: http://svn.apache.org/viewvc?rev=1187740&view=rev Log: merge rev 1187571 add a simple .gitignore Added: tomcat/trunk/.gitignore Modified: tomcat/trunk/ (props changed) Propchange: tomcat/trunk/ -- svn:mergeinfo = /tomcat/tc7.0.x/trunk:1187571 Added: tomcat/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1187740&view=auto == --- tomcat/trunk/.gitignore (added) +++ tomcat/trunk/.gitignore Sat Oct 22 17:49:29 2011 @@ -0,0 +1,6 @@ +target +output +build.properties +work +logs +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187764 - in /tomcat/tc7.0.x/trunk/maven: ./ tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-catalina-ws/ tomcat-catalina/
Author: olamy
Date: Sat Oct 22 19:50:49 2011
New Revision: 1187764
URL: http://svn.apache.org/viewvc?rev=1187764&view=rev
Log:
temporary copy sources ${basedir}/target/src/main/java rather than to ./src/ it
will prevents to add too much svn:ignore and will be deleted by a simple clean
Modified:
tomcat/tc7.0.x/trunk/maven/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-extras-juli-adapters/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper-el/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-tests/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-tribes/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml
Modified: tomcat/tc7.0.x/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/pom.xml Sat Oct 22 19:50:49 2011
@@ -41,6 +41,7 @@
true
ISO-8859-1
+${basedir}/target/src/main/java
@@ -79,6 +80,7 @@
+${sourceBasePath}
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml Sat Oct 22
19:50:49 2011
@@ -41,7 +41,7 @@
generate-sources
-
+
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml Sat Oct 22 19:50:49 2011
@@ -47,7 +47,7 @@
generate-sources
-
+
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml Sat Oct 22 19:50:49
2011
@@ -62,7 +62,7 @@
generate-sources
-
+
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Sat Oct 22 19:50:49
2011
@@ -81,7 +81,7 @@
generate-sources
-
+
Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/
svn commit: r1187765 - /tomcat/tc7.0.x/trunk/maven/pom.xml
Author: olamy Date: Sat Oct 22 19:52:04 2011 New Revision: 1187765 URL: http://svn.apache.org/viewvc?rev=1187765&view=rev Log: no more need to try delete/clean src directory Modified: tomcat/tc7.0.x/trunk/maven/pom.xml Modified: tomcat/tc7.0.x/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/pom.xml?rev=1187765&r1=1187764&r2=1187765&view=diff == --- tomcat/tc7.0.x/trunk/maven/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/pom.xml Sat Oct 22 19:52:04 2011 @@ -88,13 +88,6 @@ org.apache.maven.plugins maven-clean-plugin 2.4.1 - - - -src - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188346 - /tomcat/maven-plugin/trunk/src/site/apt/index.apt
Author: olamy Date: Mon Oct 24 20:09:26 2011 New Revision: 1188346 URL: http://svn.apache.org/viewvc?rev=1188346&view=rev Log: more documentation on groupId change an how to configure that in pom Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt Modified: tomcat/maven-plugin/trunk/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt?rev=1188346&r1=1188345&r2=1188346&view=diff == --- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original) +++ tomcat/maven-plugin/trunk/src/site/apt/index.apt Mon Oct 24 20:09:26 2011 @@ -35,6 +35,36 @@ Apache Tomcat Maven Plugin Since version 2.0 tomcat mojos has been renamed to tomcat6 and tomcat7 with the same goals. + You must configure your pom to use this new groupId + ++-- + + + + org.apache.tomcat.maven + tomcat6-maven-plugin + 2.0-SNAPSHOT + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.0-SNAPSHOT + + + ++-- + + Or add the groupId in your settings.xml + ++-- + + +org.apache.tomcat.maven + + ++-- + + * Goals Overview The goals for this plugin come in two categories: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1188347 - in /tomcat/maven-plugin/trunk/src/site/apt: index.apt index.apt.vm
Author: olamy
Date: Mon Oct 24 20:09:53 2011
New Revision: 1188347
URL: http://svn.apache.org/viewvc?rev=1188347&view=rev
Log:
use .apt.vm to have pom sample up2date with real plugin version
Added:
tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm (contents, props
changed)
- copied, changed from r1188346,
tomcat/maven-plugin/trunk/src/site/apt/index.apt
Removed:
tomcat/maven-plugin/trunk/src/site/apt/index.apt
Copied: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm (from r1188346,
tomcat/maven-plugin/trunk/src/site/apt/index.apt)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm?p2=tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm&p1=tomcat/maven-plugin/trunk/src/site/apt/index.apt&r1=1188346&r2=1188347&rev=1188347&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/index.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm Mon Oct 24 20:09:53 2011
@@ -43,12 +43,12 @@ Apache Tomcat Maven Plugin
org.apache.tomcat.maven
tomcat6-maven-plugin
- 2.0-SNAPSHOT
+ ${project.version}
org.apache.tomcat.maven
tomcat7-maven-plugin
- 2.0-SNAPSHOT
+ ${project.version}
Propchange: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
--
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1196179 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java tomcat7-war-runner/src/main/java/org/apache
Author: olamy
Date: Tue Nov 1 18:10:01 2011
New Revision: 1196179
URL: http://svn.apache.org/viewvc?rev=1196179&view=rev
Log:
[MTOMCAT-103] Executable War fails to run with a NullPointerException
do not record jar entry starting with / remove it.
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/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=1196179&r1=1196178&r2=1196179&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
Tue Nov 1 18:10:01 2011
@@ -282,10 +282,11 @@ public abstract class AbstractExecWarMoj
if ( "war".equals( project.getPackaging() ) )
{
-os.putArchiveEntry( new JarArchiveEntry( path + ".war" ) );
+
+os.putArchiveEntry( new JarArchiveEntry(
StringUtils.removeStart( path, "/" ) + ".war" ) );
IOUtils.copy( new FileInputStream( projectArtifact.getFile()
), os );
os.closeArchiveEntry();
-properties.put( Tomcat7Runner.WARS_KEY, path + ".war|" + path
);
+properties.put( Tomcat7Runner.WARS_KEY,
StringUtils.removeStart( path, "/" ) + ".war|" + path );
}
if ( "pom".equals( project.getPackaging() ) && (
warRunDependencies != null
@@ -318,13 +319,11 @@ public abstract class AbstractExecWarMoj
if ( propertyWarValue != null )
{
properties.put( Tomcat7Runner.WARS_KEY,
-propertyWarValue + ";" +
warFileName + "|"
-+ warRunDependency.contextPath
);
+propertyWarValue + ";" +
warFileName + "|" + warRunDependency.contextPath );
}
else
{
-properties.put( Tomcat7Runner.WARS_KEY,
-warFileName + "|" +
warRunDependency.contextPath );
+properties.put( Tomcat7Runner.WARS_KEY,
warFileName + "|" + warRunDependency.contextPath );
}
}
}
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=1196179&r1=1196178&r2=1196179&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
Tue Nov 1 18:10:01 2011
@@ -343,7 +343,12 @@ public class Tomcat7Runner
inputStream =
Thread.currentThread().getContextClassLoader().getResourceAsStream( "conf/" +
fileName );
if ( inputStream != null )
{
-expand( inputStream, new File( extractDirectory, "conf/" +
fileName ) );
+File confDirectory = new File( extractDirectory, "conf" );
+if ( !confDirectory.exists() )
+{
+confDirectory.mkdirs();
+}
+expand( inputStream, new File( confDirectory, fileName ) );
}
}
finally
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1196544 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/
Author: olamy
Date: Wed Nov 2 11:30:23 2011
New Revision: 1196544
URL: http://svn.apache.org/viewvc?rev=1196544&view=rev
Log:
fix warSourceDirectory expression/default-value
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1196544&r1=1196543&r2=1196544&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
Wed Nov 2 11:30:23 2011
@@ -71,7 +71,7 @@ public class RunMojo
/**
* The web resources directory for the web application being run.
*
- * @parameter expression="${basedir}/src/main/webapp"
+ * @parameter default-value="${basedir}/src/main/webapp" expression =
"${tomcat.warSourceDirectory}"
*/
private File warSourceDirectory;
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1196544&r1=1196543&r2=1196544&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Wed Nov 2 11:30:23 2011
@@ -67,7 +67,7 @@ public class RunMojo
/**
* The web resources directory for the web application being run.
*
- * @parameter expression="${basedir}/src/main/webapp"
+ * @parameter default-value="${basedir}/src/main/webapp" expression =
"${tomcat.warSourceDirectory}"
*/
private File warSourceDirectory;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197648 - /tomcat/taglibs/trunks/pom.xml
Author: olamy Date: Fri Nov 4 16:51:54 2011 New Revision: 1197648 URL: http://svn.apache.org/viewvc?rev=1197648&view=rev Log: add an aggregator pom to build all projects in once Added: tomcat/taglibs/trunks/pom.xml (with props) Added: tomcat/taglibs/trunks/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/trunks/pom.xml?rev=1197648&view=auto == --- tomcat/taglibs/trunks/pom.xml (added) +++ tomcat/taglibs/trunks/pom.xml Fri Nov 4 16:51:54 2011 @@ -0,0 +1,28 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + 4.0.0 + org.apache.tomcat.taglibs + taglibs-aggregator + pom + 1.0-SNAPSHOT + Taglibs Aggregator Project + + +taglibs-parent +standard +rdc +extended +site + + + + +org.apache.maven.plugins +maven-deploy-plugin +2.6 + + true + + + + + Propchange: tomcat/taglibs/trunks/pom.xml -- svn:eol-style = native Propchange: tomcat/taglibs/trunks/pom.xml -- svn:keywords = Author Date Id Revision - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197649 - /tomcat/taglibs/rdc/trunk/pom.xml
Author: olamy Date: Fri Nov 4 16:52:24 2011 New Revision: 1197649 URL: http://svn.apache.org/viewvc?rev=1197649&view=rev Log: fix parent path Modified: tomcat/taglibs/rdc/trunk/pom.xml Modified: tomcat/taglibs/rdc/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/pom.xml?rev=1197649&r1=1197648&r2=1197649&view=diff == --- tomcat/taglibs/rdc/trunk/pom.xml (original) +++ tomcat/taglibs/rdc/trunk/pom.xml Fri Nov 4 16:52:24 2011 @@ -24,6 +24,7 @@ org.apache.taglibs taglibs-parent 1-SNAPSHOT +../taglibs-parent/pom.xml taglibs-rdc-parent - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197650 - /tomcat/taglibs/site/pom.xml
Author: olamy Date: Fri Nov 4 16:52:37 2011 New Revision: 1197650 URL: http://svn.apache.org/viewvc?rev=1197650&view=rev Log: fix parent path Modified: tomcat/taglibs/site/pom.xml Modified: tomcat/taglibs/site/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/pom.xml?rev=1197650&r1=1197649&r2=1197650&view=diff == --- tomcat/taglibs/site/pom.xml (original) +++ tomcat/taglibs/site/pom.xml Fri Nov 4 16:52:37 2011 @@ -24,6 +24,7 @@ org.apache.taglibs taglibs-parent 1-SNAPSHOT +../taglibs-parent/pom.xml site - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197651 - in /tomcat/taglibs/standard/trunk: build-tools/pom.xml compat/pom.xml impl/pom.xml jstlel/pom.xml pom.xml spec/pom.xml
Author: olamy Date: Fri Nov 4 16:52:58 2011 New Revision: 1197651 URL: http://svn.apache.org/viewvc?rev=1197651&view=rev Log: fix parent path Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1197651&r1=1197650&r2=1197651&view=diff == --- tomcat/taglibs/standard/trunk/build-tools/pom.xml (original) +++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Fri Nov 4 16:52:58 2011 @@ -26,8 +26,8 @@ 4.0.0 org.apache.taglibs -taglibs-parent -1-SNAPSHOT +taglibs-standard +1.2-SNAPSHOT taglibs-build-tools Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1197651&r1=1197650&r2=1197651&view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Fri Nov 4 16:52:58 2011 @@ -26,8 +26,8 @@ 4.0.0 org.apache.taglibs -taglibs-parent -1-SNAPSHOT +taglibs-standard +1.2-SNAPSHOT taglibs-standard-compat Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1197651&r1=1197650&r2=1197651&view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Fri Nov 4 16:52:58 2011 @@ -26,8 +26,8 @@ 4.0.0 org.apache.taglibs -taglibs-parent -1-SNAPSHOT +taglibs-standard +1.2-SNAPSHOT taglibs-standard-impl Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1197651&r1=1197650&r2=1197651&view=diff == --- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original) +++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Fri Nov 4 16:52:58 2011 @@ -26,8 +26,8 @@ 4.0.0 org.apache.taglibs -taglibs-parent -1-SNAPSHOT +taglibs-standard +1.2-SNAPSHOT taglibs-standard-jstlel Modified: tomcat/taglibs/standard/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1197651&r1=1197650&r2=1197651&view=diff == --- tomcat/taglibs/standard/trunk/pom.xml (original) +++ tomcat/taglibs/standard/trunk/pom.xml Fri Nov 4 16:52:58 2011 @@ -28,6 +28,7 @@ org.apache.taglibs taglibs-parent 1-SNAPSHOT +../taglibs-parent/pom.xml pom Modified: tomcat/taglibs/standard/trunk/spec/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1197651&r1=1197650&r2=1197651&view=diff == --- tomcat/taglibs/standard/trunk/spec/pom.xml (original) +++ tomcat/taglibs/standard/trunk/spec/pom.xml Fri Nov 4 16:52:58 2011 @@ -22,8 +22,8 @@ 4.0.0 org.apache.taglibs -taglibs-parent -1-SNAPSHOT +taglibs-standard +1.2-SNAPSHOT taglibs-standard-spec - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197654 - /tomcat/taglibs/trunks/pom.xml
Author: olamy Date: Fri Nov 4 16:53:48 2011 New Revision: 1197654 URL: http://svn.apache.org/viewvc?rev=1197654&view=rev Log: add missing ASF header Modified: tomcat/taglibs/trunks/pom.xml Modified: tomcat/taglibs/trunks/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/trunks/pom.xml?rev=1197654&r1=1197653&r2=1197654&view=diff == --- tomcat/taglibs/trunks/pom.xml (original) +++ tomcat/taglibs/trunks/pom.xml Fri Nov 4 16:53:48 2011 @@ -1,3 +1,22 @@ + + http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.tomcat.taglibs - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197655 - /tomcat/taglibs/extended/trunk/pom.xml
Author: olamy Date: Fri Nov 4 16:54:14 2011 New Revision: 1197655 URL: http://svn.apache.org/viewvc?rev=1197655&view=rev Log: fix parent path Modified: tomcat/taglibs/extended/trunk/pom.xml Modified: tomcat/taglibs/extended/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/extended/trunk/pom.xml?rev=1197655&r1=1197654&r2=1197655&view=diff == --- tomcat/taglibs/extended/trunk/pom.xml (original) +++ tomcat/taglibs/extended/trunk/pom.xml Fri Nov 4 16:54:14 2011 @@ -24,6 +24,7 @@ org.apache.taglibs taglibs-parent 1-SNAPSHOT +../taglibs-parent/pom.xml taglibs-extended - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197658 - /tomcat/taglibs/extended/trunk/
Author: olamy Date: Fri Nov 4 16:55:08 2011 New Revision: 1197658 URL: http://svn.apache.org/viewvc?rev=1197658&view=rev Log: add basic svn ignore Modified: tomcat/taglibs/extended/trunk/ (props changed) Propchange: tomcat/taglibs/extended/trunk/ -- --- svn:ignore (added) +++ svn:ignore Fri Nov 4 16:55:08 2011 @@ -0,0 +1,5 @@ +target +*.iml +.classpath +.project +.settings - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197660 - /tomcat/taglibs/rdc/trunk/
Author: olamy Date: Fri Nov 4 16:55:53 2011 New Revision: 1197660 URL: http://svn.apache.org/viewvc?rev=1197660&view=rev Log: ignore *.iml Modified: tomcat/taglibs/rdc/trunk/ (props changed) Propchange: tomcat/taglibs/rdc/trunk/ -- --- svn:ignore (original) +++ svn:ignore Fri Nov 4 16:55:53 2011 @@ -3,3 +3,4 @@ .settings bin target +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197662 - /tomcat/taglibs/site/
Author: olamy Date: Fri Nov 4 16:56:48 2011 New Revision: 1197662 URL: http://svn.apache.org/viewvc?rev=1197662&view=rev Log: add basic svn ignore Modified: tomcat/taglibs/site/ (props changed) Propchange: tomcat/taglibs/site/ -- --- svn:ignore (added) +++ svn:ignore Fri Nov 4 16:56:48 2011 @@ -0,0 +1,5 @@ +*.iml +target +.classpath +.settings +.project - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197663 - /tomcat/taglibs/standard/trunk/
Author: olamy Date: Fri Nov 4 16:58:02 2011 New Revision: 1197663 URL: http://svn.apache.org/viewvc?rev=1197663&view=rev Log: ignore target Modified: tomcat/taglibs/standard/trunk/ (props changed) Propchange: tomcat/taglibs/standard/trunk/ -- --- svn:ignore (original) +++ svn:ignore Fri Nov 4 16:58:02 2011 @@ -1 +1,3 @@ *.iml +target + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197670 - /tomcat/taglibs/trunks/
Author: olamy Date: Fri Nov 4 17:09:18 2011 New Revision: 1197670 URL: http://svn.apache.org/viewvc?rev=1197670&view=rev Log: basic svn ignore Modified: tomcat/taglibs/trunks/ (props changed) Propchange: tomcat/taglibs/trunks/ -- --- svn:ignore (added) +++ svn:ignore Fri Nov 4 17:09:18 2011 @@ -0,0 +1,5 @@ +.idea +*.iml +.project +.classpath +.settings - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197672 - in /tomcat/taglibs/rdc/trunk: taglibs-rdc-dist/ taglibs-rdc-examples/ taglibs-rdc/
Author: olamy Date: Fri Nov 4 17:12:18 2011 New Revision: 1197672 URL: http://svn.apache.org/viewvc?rev=1197672&view=rev Log: ignore *.iml Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc/ (props changed) tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/ (props changed) tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/ (props changed) Propchange: tomcat/taglibs/rdc/trunk/taglibs-rdc/ -- --- svn:ignore (original) +++ svn:ignore Fri Nov 4 17:12:18 2011 @@ -1 +1,2 @@ target +*.iml Propchange: tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/ -- --- svn:ignore (original) +++ svn:ignore Fri Nov 4 17:12:18 2011 @@ -1 +1,2 @@ target +*.iml Propchange: tomcat/taglibs/rdc/trunk/taglibs-rdc-examples/ -- --- svn:ignore (original) +++ svn:ignore Fri Nov 4 17:12:18 2011 @@ -1 +1,2 @@ target +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197675 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: olamy
Date: Fri Nov 4 17:21:20 2011
New Revision: 1197675
URL: http://svn.apache.org/viewvc?rev=1197675&view=rev
Log:
upgrade maven plugins version
Modified:
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1197675&r1=1197674&r2=1197675&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Fri Nov 4 17:21:20 2011
@@ -106,16 +106,21 @@
-
-org.apache.maven.plugins
-maven-compiler-plugin
-2.3.2
-
- ${maven.compiler.source}
- ${maven.compiler.target}
- ${project.build.sourceEncoding}
-
-
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.3.2
+
+${maven.compiler.source}
+${maven.compiler.target}
+${project.build.sourceEncoding}
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.9
+
@@ -141,7 +146,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.7
+2.8
true
@@ -169,12 +174,12 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
-2.2
+2.4
org.apache.maven.plugins
maven-surefire-report-plugin
-2.7.2
+2.9
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197681 - /tomcat/taglibs/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/Number.java
Author: olamy
Date: Fri Nov 4 17:31:46 2011
New Revision: 1197681
URL: http://svn.apache.org/viewvc?rev=1197681&view=rev
Log:
fix compilation
Modified:
tomcat/taglibs/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/Number.java
Modified:
tomcat/taglibs/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/Number.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/Number.java?rev=1197681&r1=1197680&r2=1197681&view=diff
==
---
tomcat/taglibs/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/Number.java
(original)
+++
tomcat/taglibs/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/Number.java
Fri Nov 4 17:31:46 2011
@@ -128,11 +128,13 @@ public class Number extends BaseModel {
*/
protected Boolean validate(Object newValue, boolean setErrorCode) {
-if (maxValue != null && maxValue.compareTo(newValue) < 0) {
+if (! (newValue instanceof Double)) return Boolean.FALSE;
+
+if (maxValue != null && maxValue.compareTo((Double)newValue) < 0) {
if (setErrorCode) setErrorCode(ERR_NEED_SHORTER_NUMBER);
return Boolean.FALSE;
}
-if (minValue != null && minValue.compareTo(newValue) > 0) {
+if (minValue != null && minValue.compareTo((Double)newValue) > 0) {
if (setErrorCode) setErrorCode(ERR_NEED_LONGER_NUMBER);
return Boolean.FALSE;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197685 - in /tomcat/taglibs/rdc/trunk: pom.xml taglibs-rdc-dist/pom.xml
Author: olamy
Date: Fri Nov 4 17:36:21 2011
New Revision: 1197685
URL: http://svn.apache.org/viewvc?rev=1197685&view=rev
Log:
move dependency to dependencyManagement section
Modified:
tomcat/taglibs/rdc/trunk/pom.xml
tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml
Modified: tomcat/taglibs/rdc/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/pom.xml?rev=1197685&r1=1197684&r2=1197685&view=diff
==
--- tomcat/taglibs/rdc/trunk/pom.xml (original)
+++ tomcat/taglibs/rdc/trunk/pom.xml Fri Nov 4 17:36:21 2011
@@ -130,6 +130,17 @@
1.1.2
true
+
+org.apache.taglibs
+taglibs-rdc
+${project.version}
+
+
+org.apache.taglibs
+taglibs-rdc-examples
+${project.version}
+war
+
Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml?rev=1197685&r1=1197684&r2=1197685&view=diff
==
--- tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml (original)
+++ tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml Fri Nov 4 17:36:21 2011
@@ -35,12 +35,10 @@
org.apache.taglibs
taglibs-rdc
- ${version}
org.apache.taglibs
taglibs-rdc-examples
- ${version}
war
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197691 - in /tomcat/taglibs/rdc/trunk/taglibs-rdc-dist: pom.xml src/assembly/bin.xml src/assembly/src.xml
Author: olamy
Date: Fri Nov 4 17:54:11 2011
New Revision: 1197691
URL: http://svn.apache.org/viewvc?rev=1197691&view=rev
Log:
don't use ${version} but ${project.version}
fix assembly plugin declaration.
Modified:
tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml
tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/bin.xml
tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/src.xml
Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml?rev=1197691&r1=1197690&r2=1197691&view=diff
==
--- tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml (original)
+++ tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/pom.xml Fri Nov 4 17:54:11 2011
@@ -49,6 +49,12 @@
maven-assembly-plugin
+
+
+src/assembly/bin.xml
+src/assembly/src.xml
+
+
attached
Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/bin.xml?rev=1197691&r1=1197690&r2=1197691&view=diff
==
--- tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/bin.xml (original)
+++ tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/bin.xml Fri Nov 4
17:54:11 2011
@@ -21,7 +21,7 @@
tar.gz
zip
-taglibs-rdc-${version}
+taglibs-rdc-${project.version}
false
Modified: tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/src.xml?rev=1197691&r1=1197690&r2=1197691&view=diff
==
--- tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/src.xml (original)
+++ tomcat/taglibs/rdc/trunk/taglibs-rdc-dist/src/assembly/src.xml Fri Nov 4
17:54:11 2011
@@ -21,7 +21,7 @@
tar.gz
zip
-taglibs-rdc-${version}-src
+taglibs-rdc-${project.version}-src
..
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197694 - /tomcat/taglibs/standard/trunk/src/assembly/src.xml
Author: olamy
Date: Fri Nov 4 17:55:40 2011
New Revision: 1197694
URL: http://svn.apache.org/viewvc?rev=1197694&view=rev
Log:
don't use ${version} but ${project.version}
Modified:
tomcat/taglibs/standard/trunk/src/assembly/src.xml
Modified: tomcat/taglibs/standard/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/src/assembly/src.xml?rev=1197694&r1=1197693&r2=1197694&view=diff
==
--- tomcat/taglibs/standard/trunk/src/assembly/src.xml (original)
+++ tomcat/taglibs/standard/trunk/src/assembly/src.xml Fri Nov 4 17:55:40 2011
@@ -20,7 +20,7 @@
tar.gz
zip
-${artifactId}-${version}-src
+${artifactId}-${project.version}-src
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1197695 - /tomcat/taglibs/extended/trunk/src/assembly/src.xml
Author: olamy
Date: Fri Nov 4 17:56:06 2011
New Revision: 1197695
URL: http://svn.apache.org/viewvc?rev=1197695&view=rev
Log:
don't use ${version} but ${project.version}
Modified:
tomcat/taglibs/extended/trunk/src/assembly/src.xml
Modified: tomcat/taglibs/extended/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/extended/trunk/src/assembly/src.xml?rev=1197695&r1=1197694&r2=1197695&view=diff
==
--- tomcat/taglibs/extended/trunk/src/assembly/src.xml (original)
+++ tomcat/taglibs/extended/trunk/src/assembly/src.xml Fri Nov 4 17:56:06 2011
@@ -20,7 +20,7 @@
tar.gz
zip
-${artifactId}-${version}-src
+${artifactId}-${project.version}-src
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1198103 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tom
Author: olamy
Date: Sat Nov 5 22:49:59 2011
New Revision: 1198103
URL: http://svn.apache.org/viewvc?rev=1198103&view=rev
Log:
[MTOMCAT-100] support war overlay to add war external dependencies in tomcat run
delete temporary directories used for extract after plugin shutdown.
Added:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java
- copied, changed from r1196544,
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java?rev=1198103&r1=1198102&r2=1198103&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java
Sat Nov 5 22:49:59 2011
@@ -27,6 +27,6 @@ import java.util.List;
*/
public interface ClassLoaderEntriesCalculator
{
-List calculateClassPathEntries(
ClassLoaderEntriesCalculatorRequest classLoaderEntriesCalculatorRequest )
+ClassLoaderEntriesCalculatorResult calculateClassPathEntries(
ClassLoaderEntriesCalculatorRequest classLoaderEntriesCalculatorRequest )
throws TomcatRunException;
}
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java?rev=1198103&r1=1198102&r2=1198103&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
Sat Nov 5 22:49:59 2011
@@ -22,6 +22,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
+import java.io.File;
import java.util.Set;
/**
@@ -95,4 +96,5 @@ public class ClassLoaderEntriesCalculato
this.useTestClassPath = useTestClassPath;
return this;
}
+
}
Copied:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java
(from r1196544,
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java?p2=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java&p1=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java&r1=1196544&r2=1198103&rev=1198103&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java
Sat Nov 5 22:49:59 2011
@@ -1,5 +1,
svn commit: r1198104 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java
Author: olamy Date: Sat Nov 5 22:54:47 2011 New Revision: 1198104 URL: http://svn.apache.org/viewvc?rev=1198104&view=rev Log: remove unused import Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java?rev=1198104&r1=1198103&r2=1198104&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorRequest.java Sat Nov 5 22:54:47 2011 @@ -22,7 +22,6 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; -import java.io.File; import java.util.Set; /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1198376 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy
Date: Sun Nov 6 14:13:09 2011
New Revision: 1198376
URL: http://svn.apache.org/viewvc?rev=1198376&view=rev
Log:
[MTOMCAT-100] support war overlay to add war external dependencies in tomcat run
fix extraction of war overlay content files was extracted in .
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1198376&r1=1198375&r2=1198376&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Sun Nov 6 14:13:09 2011
@@ -28,6 +28,7 @@ import org.codehaus.plexus.archiver.Arch
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.StringUtils;
@@ -130,6 +131,8 @@ public class DefaultClassLoaderEntriesCa
File tmpDir = new File( tmpExtractDatas,
artifact.getArtifactId() );
+tmpDir.mkdirs();
+
tmpDirectories.add( tmpDir );
try
@@ -140,6 +143,8 @@ public class DefaultClassLoaderEntriesCa
unArchiver.setSourceFile( warFile );
unArchiver.setDestDirectory( tmpDir );
unArchiver.extract();
+
+
File libsDirectory = new File( tmpDir, "WEB-INF/lib" );
if ( libsDirectory.exists() )
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1198525 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy Date: Sun Nov 6 18:24:34 2011 New Revision: 1198525 URL: http://svn.apache.org/viewvc?rev=1198525&view=rev Log: remove unused import Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1198525&r1=1198524&r2=1198525&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Sun Nov 6 18:24:34 2011 @@ -28,7 +28,6 @@ import org.codehaus.plexus.archiver.Arch import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; -import org.codehaus.plexus.archiver.zip.ZipUnArchiver; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.StringUtils; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1198740 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Author: olamy
Date: Mon Nov 7 14:06:26 2011
New Revision: 1198740
URL: http://svn.apache.org/viewvc?rev=1198740&view=rev
Log:
[MTOMCAT-100] support war overlay to add war external dependencies in tomcat run
avoid duplicate jars in the webappclassloader: can cause issues with struts2
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1198740&r1=1198739&r2=1198740&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Mon Nov 7 14:06:26 2011
@@ -59,6 +59,8 @@ public class DefaultClassLoaderEntriesCa
{
Set classLoaderEntries = new LinkedHashSet();
+List fileInClassLoaderEntries = new ArrayList();
+
List tmpDirectories = new ArrayList();
// add classes directories to loader
@@ -113,7 +115,12 @@ public class DefaultClassLoaderEntriesCa
+ artifact.getVersion() + ":" +
artifact.getScope() );
if ( !isInProjectReferences( artifact,
request.getMavenProject() ) )
{
-classLoaderEntries.add(
artifact.getFile().toURI().toString() );
+String fileName = artifact.getFile().getName();
+if ( !fileInClassLoaderEntries.contains( fileName ) )
+{
+classLoaderEntries.add(
artifact.getFile().toURI().toString() );
+fileInClassLoaderEntries.add( fileName );
+}
}
else
{
@@ -122,8 +129,6 @@ public class DefaultClassLoaderEntriesCa
}
}
-
-
// in case of war dependency we must add /WEB-INF/lib/*.jar in
entries and WEB-INF/classes
if ( "war".equals( artifact.getType() ) &&
request.isAddWarDependenciesInClassloader() )
{
@@ -143,7 +148,6 @@ public class DefaultClassLoaderEntriesCa
unArchiver.setDestDirectory( tmpDir );
unArchiver.extract();
-
File libsDirectory = new File( tmpDir, "WEB-INF/lib" );
if ( libsDirectory.exists() )
{
@@ -156,7 +160,17 @@ public class DefaultClassLoaderEntriesCa
} );
for ( String jar : jars )
{
-classLoaderEntries.add( new File(
libsDirectory, jar ).toURI().toString() );
+File jarFile = new File( libsDirectory, jar );
+if ( !fileInClassLoaderEntries.contains(
jarFile.getName() ) )
+{
+classLoaderEntries.add(
jarFile.toURI().toString() );
+fileInClassLoaderEntries.add(
jarFile.getName() );
+}
+else
+{
+request.getLog().debug( "skip adding file
" + jarFile.getPath()
++ " as it's
already in classloader entries" );
+}
}
}
File classesDirectory = new File( tmpDir,
"WEB-INF/classes" );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1201038 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy
Date: Fri Nov 11 19:55:29 2011
New Revision: 1201038
URL: http://svn.apache.org/viewvc?rev=1201038&view=rev
Log:
setup ok to deploy snapshots to r.a.o
Modified:
tomcat/maven-plugin/trunk/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1201038&r1=1201037&r2=1201038&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Fri Nov 11 19:55:29 2011
@@ -16,7 +16,9 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+-->
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
@@ -51,9 +53,11 @@
false
\
scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
scp://people.apache.org/www/tomcat.apache.org/maven-plugin-${project.version}
-apache.snapshots
+
+
https://repository.apache.org/content/repositories/snapshots
+apache.snapshots.https
+
1973
@@ -593,6 +597,7 @@
Apache Release Distribution Repository
${distributionReleaseUrl}
+
${distributionIdSnapshots}
Apache Development Snapshot Repository
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1201043 - /tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt
Author: olamy Date: Fri Nov 11 20:30:22 2011 New Revision: 1201043 URL: http://svn.apache.org/viewvc?rev=1201043&view=rev Log: document to use snapshot group on r.a.o to test snapshot Modified: tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt Modified: tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt?rev=1201043&r1=1201042&r2=1201043&view=diff == --- tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt (original) +++ tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt Fri Nov 11 20:30:22 2011 @@ -37,7 +37,7 @@ Testing SNAPSHOT people.apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository + http://repository.apache.org/content/groups/snapshots-group/ false @@ -51,7 +51,7 @@ Testing SNAPSHOT apache.snapshots Apache Snapshots - http://people.apache.org/repo/m2-snapshot-repository + http://repository.apache.org/content/groups/snapshots-group/ false - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203144 - in /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run: AbstractExecWarMojo.java ExtraDependency.java
Author: olamy
Date: Thu Nov 17 10:42:03 2011
New Revision: 1203144
URL: http://svn.apache.org/viewvc?rev=1203144&view=rev
Log:
[MTOMCAT-106] tomcat7-maven-plugin extraDependency not working with class not
found
attached patch not used, implements a more simple solution.
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java
(with props)
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.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=1203144&r1=1203143&r2=1203144&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
Thu Nov 17 10:42:03 2011
@@ -209,7 +209,7 @@ public abstract class AbstractExecWarMoj
*
* @parameter
*/
-private List extraDependencies;
+private List extraDependencies;
/**
* Main class to use for starting the standalone jar.
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java?rev=1203144&view=auto
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java
(added)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java
Thu Nov 17 10:42:03 2011
@@ -0,0 +1,31 @@
+package org.apache.tomcat.maven.plugin.tomcat7.run;
+/*
+ * 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.
+ */
+
+import org.apache.maven.model.Dependency;
+
+/**
+ * @author Olivier Lamy
+ * @since 2.0
+ */
+public class ExtraDependency
+extends Dependency
+{
+// no op just here to support for maven 2.x
+}
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java
--
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtraDependency.java
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1206936 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy Date: Mon Nov 28 00:19:48 2011 New Revision: 1206936 URL: http://svn.apache.org/viewvc?rev=1206936&view=rev Log: use skin released version Modified: tomcat/maven-plugin/trunk/src/site/site.xml Modified: tomcat/maven-plugin/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1206936&r1=1206935&r2=1206936&view=diff == --- tomcat/maven-plugin/trunk/src/site/site.xml (original) +++ tomcat/maven-plugin/trunk/src/site/site.xml Mon Nov 28 00:19:48 2011 @@ -33,7 +33,7 @@ org.apache.maven.skins maven-fluido-skin -1.0-SNAPSHOT +1.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1207907 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Tue Nov 29 15:26:38 2011 New Revision: 1207907 URL: http://svn.apache.org/viewvc?rev=1207907&view=rev Log: upgrade to tomcat 7.0.23 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1207907&r1=1207906&r2=1207907&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue Nov 29 15:26:38 2011 @@ -66,7 +66,7 @@ 2001 2008 -7.0.22 +7.0.23 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1207930 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Tue Nov 29 15:47:02 2011 New Revision: 1207930 URL: http://svn.apache.org/viewvc?rev=1207930&view=rev Log: use rat plugin 0.8 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1207930&r1=1207929&r2=1207930&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue Nov 29 15:47:02 2011 @@ -559,7 +559,7 @@ org.apache.rat apache-rat-plugin - 0.7 + 0.8 .gitignore - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212618 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml
Author: olamy Date: Fri Dec 9 20:42:05 2011 New Revision: 1212618 URL: http://svn.apache.org/viewvc?rev=1212618&view=rev Log: upgrade some dependencies version Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 20:42:05 2011 @@ -61,6 +61,11 @@ + org.apache.httpcomponents + fluent-hc + + + org.apache.tomcat tomcat-catalina 7.0.22 Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Fri Dec 9 20:42:05 2011 @@ -46,8 +46,8 @@ 2.0.8 false -2.10 -4.9 +2.11 +4.10 2000 false false @@ -471,22 +471,27 @@ org.apache.httpcomponents httpclient -4.1.2 +4.2-alpha1 + + +org.apache.httpcomponents +fluent-hc +4.2-alpha1 org.slf4j slf4j-api -1.6.1 +1.6.4 ch.qos.logback logback-core -0.9.30 +1.0.0 ch.qos.logback logback-classic -0.9.30 +1.0.0 @@ -507,7 +512,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.10 + 2.11 org.apache.maven.plugins - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212619 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
Author: olamy
Date: Fri Dec 9 20:42:21 2011
New Revision: 1212619
URL: http://svn.apache.org/viewvc?rev=1212619&view=rev
Log:
upgrade tomcat6 plugin to use 6.0.35 artifacts
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1212619&r1=1212618&r2=1212619&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Fri Dec 9 20:42:21
2011
@@ -34,7 +34,7 @@
-6.0.33
+6.0.35
${basedir}/target/
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
${basedir}/src/test/keystore
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212685 - in /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin: pom.xml src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Author: olamy Date: Fri Dec 9 23:32:13 2011 New Revision: 1212685 URL: http://svn.apache.org/viewvc?rev=1212685&view=rev Log: use asf httpclient and add preemptive support to avoid uploading twice Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212685&r1=1212684&r2=1212685&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 23:32:13 2011 @@ -66,6 +66,11 @@ + org.apache.httpcomponents + httpclient + + + org.apache.tomcat tomcat-catalina 7.0.22 Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212685&r1=1212684&r2=1212685&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java Fri Dec 9 23:32:13 2011 @@ -20,22 +20,35 @@ package org.apache.tomcat.maven.common.d */ import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.http.HttpHost; +import org.apache.http.HttpResponse; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.Credentials; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.AuthCache; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.protocol.ClientContext; +import org.apache.http.entity.AbstractHttpEntity; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.impl.client.BasicAuthCache; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.conn.BasicClientConnectionManager; +import org.apache.http.protocol.BasicHttpContext; -import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; -import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; /** * FIXME http connection tru a proxy - * FIXME preemptive support - * FIXME move to ASF httpclient ? * A Tomcat manager webapp invocation wrapper. - * + * * @author Mark Hobson * @version $Id: TomcatManager.java 12852 2010-10-12 22:04:32Z thragor $ */ @@ -79,6 +92,10 @@ public class TomcatManager */ private String userAgent; +private DefaultHttpClient httpClient; + +private BasicHttpContext localContext; + // -- // Constructors // -- @@ -86,7 +103,7 @@ public class TomcatManager /** * Creates a Tomcat manager wrapper for the specified URL that uses a username of admin, an empty * password and ISO-8859-1 URL encoding. - * + * * @param url the full URL of the Tomcat manager instance to use */ public TomcatManager( URL url ) @@ -97,8 +114,8 @@ public class TomcatManager /** * Creates a Tomcat manager wrapper for the specified URL and username that uses an empty password and ISO-8859-1 * URL encoding. - * - * @param url the full URL of the Tomcat manager instance to use + * + * @param url the full URL of the Tomcat manager instance to use * @param username the username to use when authenticating with Tomcat manager */ public TomcatManager( URL url, String username ) @@ -108,8 +125,8 @@ public class TomcatManager /** * Creates a Tomcat manager wrapper for the specified URL, username and password that uses ISO-8859-1 URL encoding. - * - * @param url the full URL of the Tomcat manager instance to use + * + * @param url the full URL of the Tomcat manager instance to use * @param username the username to use when authenticating with Tomcat manager * @param password the password to use when authenticating with Tomcat manager
svn commit: r1212686 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugi
Author: olamy
Date: Fri Dec 9 23:33:05 2011
New Revision: 1212686
URL: http://svn.apache.org/viewvc?rev=1212686&view=rev
Log:
add a bean to return more informations from a tomcat manager call
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212686&r1=1212685&r2=1212686&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Fri Dec 9 23:33:05 2011
@@ -244,7 +244,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, URL war )
+public TomcatManagerResponse deploy( String path, URL war )
throws TomcatManagerException, IOException
{
return deploy( path, war, false );
@@ -261,7 +261,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, URL war, boolean update )
+public TomcatManagerResponse deploy( String path, URL war, boolean update )
throws TomcatManagerException, IOException
{
return deploy( path, war, update, null );
@@ -279,7 +279,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, URL war, boolean update, String tag )
+public TomcatManagerResponse deploy( String path, URL war, boolean update,
String tag )
throws TomcatManagerException, IOException
{
return deployImpl( path, null, war, null, update, tag );
@@ -294,7 +294,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, InputStream war )
+public TomcatManagerResponse deploy( String path, InputStream war )
throws TomcatManagerException, IOException
{
return deploy( path, war, false );
@@ -311,7 +311,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, InputStream war, boolean update )
+public TomcatManagerResponse deploy( String path, InputStream war, boolean
update )
throws TomcatManagerException, IOException
{
return deploy( path, war, update, null );
@@ -329,7 +329,7 @@ public class TomcatManager
svn commit: r1212687 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
Author: olamy
Date: Fri Dec 9 23:33:29 2011
New Revision: 1212687
URL: http://svn.apache.org/viewvc?rev=1212687&view=rev
Log:
gloups miss adding a file
Added:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
(with props)
Added:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java?rev=1212687&view=auto
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
(added)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
Fri Dec 9 23:33:29 2011
@@ -0,0 +1,70 @@
+package org.apache.tomcat.maven.common.deployer;
+/*
+ * 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.
+ */
+
+/**
+ * @author Olivier Lamy
+ * @since 2.0
+ */
+public class TomcatManagerResponse
+{
+private int statusCode;
+
+private String reasonPhrase;
+
+private String httpResponseBody;
+
+public TomcatManagerResponse()
+{
+// no op
+}
+
+public int getStatusCode()
+{
+return statusCode;
+}
+
+public TomcatManagerResponse setStatusCode( int statusCode )
+{
+this.statusCode = statusCode;
+return this;
+}
+
+public String getReasonPhrase()
+{
+return reasonPhrase;
+}
+
+public TomcatManagerResponse setReasonPhrase( String reasonPhrase )
+{
+this.reasonPhrase = reasonPhrase;
+return this;
+}
+
+public String getHttpResponseBody()
+{
+return httpResponseBody;
+}
+
+public TomcatManagerResponse setHttpResponseBody( String httpResponseBody )
+{
+this.httpResponseBody = httpResponseBody;
+return this;
+}
+}
Propchange:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
--
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212689 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml tomcat7-maven-plugin/pom.xml
Author: olamy
Date: Fri Dec 9 23:33:43 2011
New Revision: 1212689
URL: http://svn.apache.org/viewvc?rev=1212689&view=rev
Log:
remove redundant property to declare tomcat7 version use
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212689&r1=1212688&r2=1212689&view=diff
==
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9
23:33:43 2011
@@ -73,7 +73,7 @@
org.apache.tomcat
tomcat-catalina
- 7.0.22
+ ${tomcat7Version}
provided
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=1212689&r1=1212688&r2=1212689&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Fri Dec 9 23:33:43
2011
@@ -33,7 +33,6 @@
-7.0.22
${basedir}/target/
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
${basedir}/src/test/keystore
@@ -43,88 +42,88 @@
org.apache.tomcat.embed
tomcat-embed-core
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-util
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-coyote
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jdbc
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-dbcp
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-servlet-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jsp-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jasper
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jasper-el
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-el-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-catalina
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-tribes
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-catalina-ha
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-annotations-api
- ${tomcat.version}
+ ${tomcat7Version}
@@ -133,18 +132,18 @@
org.apache.tomcat
tomcat-juli
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat.embed
tomcat-embed-logging-juli
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat.embed
tomcat-embed-logging-log4j
- ${tomcat.version}
+ ${tomcat7Version}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212873 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/EmbeddedRegistry.java
Author: olamy Date: Sat Dec 10 21:06:10 2011 New Revision: 1212873 URL: http://svn.apache.org/viewvc?rev=1212873&view=rev Log: fix javadoc Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/EmbeddedRegistry.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/EmbeddedRegistry.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/EmbeddedRegistry.java?rev=1212873&r1=1212872&r2=1212873&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/EmbeddedRegistry.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/EmbeddedRegistry.java Sat Dec 10 21:06:10 2011 @@ -95,8 +95,7 @@ public final class EmbeddedRegistry * removed from the registry. * * @param log the log to write possible shutdown exceptions to - * @throws org.apache.catalina.LifecycleException - * the first exception which occurred will be rethrown + * @throws Exception the first exception which occurred will be rethrown */ public synchronized void shutdownAll( final Log log ) throws Exception - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212874 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugi
Author: olamy
Date: Sat Dec 10 21:06:31 2011
New Revision: 1212874
URL: http://svn.apache.org/viewvc?rev=1212874&view=rev
Log:
use length of war file when we have it to avoid chunked transfer
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212874&r1=1212873&r2=1212874&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Sat Dec 10 21:06:31 2011
@@ -336,6 +336,24 @@ public class TomcatManager
}
/**
+ *
+ * @param path
+ * @param war
+ * @param update
+ * @param tag
+ * @param length
+ * @return
+ * @throws TomcatManagerException
+ * @throws IOException
+ * @since 2.0
+ */
+public TomcatManagerResponse deploy( String path, InputStream war, boolean
update, String tag, long length )
+throws TomcatManagerException, IOException
+{
+return deployImpl( path, null, null, war, update, tag, length );
+}
+
+/**
* Deploys the specified context XML configuration to the specified
context path.
*
* @param path the webapp context path to deploy to
@@ -596,13 +614,20 @@ public class TomcatManager
protected TomcatManagerResponse invoke( String path )
throws TomcatManagerException, IOException
{
-return invoke( path, null );
+return invoke( path, null, -1 );
}
// --
// Private Methods
// --
+private TomcatManagerResponse deployImpl( String path, URL config, URL
war, InputStream data, boolean update,
+ String tag )
+throws TomcatManagerException, IOException
+{
+return deployImpl( path, config, war, data, update, tag, -1 );
+}
+
/**
* Deploys the specified WAR.
*
@@ -616,7 +641,8 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-private TomcatManagerResponse deployImpl( String path, URL config, URL
war, InputStream data, boolean update, String tag )
+private TomcatManagerResponse deployImpl( String path, URL config, URL
war, InputStream data, boolean update,
+ String tag, long length )
throws TomcatManagerException, IOException
{
StringBuilder buffer = new StringBuilder( "/deploy" );
@@ -642,7 +668,7 @@ public class TomcatManager
buffer.append( "&tag=" ).append( URLEncoder.encode( tag, charset )
);
}
-return invoke( buffer.toString(), data );
+return invoke( buffer.toString(), data, length );
}
@@ -655,7 +681,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-protected TomcatManagerResponse invoke( String path, InputStream data )
+protected TomcatManagerResponse invoke( String path, InputStream data,
long length )
throws TomcatManagerException, IOException
{
@@ -668,7 +694,7 @@ public class TomcatManager
{
HttpPut httpPut = new HttpPut( url + path );
-httpPut.setEntity( new RequestEntityImplementation( data, -1 ) );
+httpPut.setEntity( new RequestEntityImplementation( data, length )
);
httpRequestBase = httpPut;
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java?rev=1212874&r1=1212873&r2=1212874&view=diff
==
---
tomcat/maven-plugin/trunk/
svn commit: r1212875 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Author: olamy
Date: Sat Dec 10 21:06:45 2011
New Revision: 1212875
URL: http://svn.apache.org/viewvc?rev=1212875&view=rev
Log:
add a transfer progress output in console when uploading war file to say to
users hey something happen :-)
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212875&r1=1212874&r2=1212875&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Sat Dec 10 21:06:45 2011
@@ -42,6 +42,7 @@ import org.apache.http.protocol.BasicHtt
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.PrintStream;
import java.net.URL;
import java.net.URLEncoder;
@@ -336,7 +337,6 @@ public class TomcatManager
}
/**
- *
* @param path
* @param war
* @param update
@@ -694,7 +694,7 @@ public class TomcatManager
{
HttpPut httpPut = new HttpPut( url + path );
-httpPut.setEntity( new RequestEntityImplementation( data, length )
);
+httpPut.setEntity( new RequestEntityImplementation( data, length,
url + path ) );
httpRequestBase = httpPut;
@@ -740,12 +740,19 @@ public class TomcatManager
private InputStream stream;
+PrintStream out = System.out;
+
private long length = -1;
-private RequestEntityImplementation( final InputStream stream, long
length )
+private int lastLength;
+
+private String url;
+
+private RequestEntityImplementation( final InputStream stream, long
length, String url )
{
this.stream = stream;
this.length = length;
+this.url = url;
}
public long getContentLength()
@@ -769,11 +776,12 @@ public class TomcatManager
public void writeTo( final OutputStream outstream )
throws IOException
{
+long completed = 0;
if ( outstream == null )
{
throw new IllegalArgumentException( "Output stream may not be
null" );
}
-
+transferInitiated( this.url );
try
{
byte[] buffer = new byte[BUFFER_SIZE];
@@ -783,7 +791,7 @@ public class TomcatManager
// until EOF
while ( ( l = stream.read( buffer ) ) != -1 )
{
-//fireTransferProgress( transferEvent, buffer, -1 );
+transferProgressed( completed += buffer.length, -1 );
outstream.write( buffer, 0, l );
}
}
@@ -793,21 +801,26 @@ public class TomcatManager
long remaining = this.length;
while ( remaining > 0 )
{
-l = stream.read( buffer, 0, (int) Math.min(
BUFFER_SIZE, remaining ) );
+int transferSize = (int) Math.min( BUFFER_SIZE,
remaining );
+completed += transferSize;
+l = stream.read( buffer, 0, transferSize );
if ( l == -1 )
{
break;
}
-//fireTransferProgress( transferEvent, buffer, (int)
Math.min( BUFFER_SIZE, remaining ) );
+
outstream.write( buffer, 0, l );
remaining -= l;
+transferProgressed( completed, this.length );
}
}
}
finally
{
stream.close();
+out.println();
}
+// end transfer
}
public boolean isStreaming()
@@ -816,5 +829,64 @@ public class TomcatManager
}
+public void transferInitiated( String url )
+{
+String message = "Uploading";
+
+out.println( message + ": " + url );
+}
+
+public void transferProgressed( long completedSize, long totalSize )
+{
+
+StringBuilder buffer = new StringBuilder( 64 );
+
+buffer.append( getStatus( completedSize, totalSize ) ).append( "
" );
+
+int
svn commit: r1212876 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Author: olamy
Date: Sat Dec 10 21:07:06 2011
New Revision: 1212876
URL: http://svn.apache.org/viewvc?rev=1212876&view=rev
Log:
add a transfer summary at the end
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212876&r1=1212875&r2=1212876&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Sat Dec 10 21:07:06 2011
@@ -45,6 +45,9 @@ import java.io.OutputStream;
import java.io.PrintStream;
import java.net.URL;
import java.net.URLEncoder;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
/**
* FIXME http connection tru a proxy
@@ -748,6 +751,8 @@ public class TomcatManager
private String url;
+private long startTime;
+
private RequestEntityImplementation( final InputStream stream, long
length, String url )
{
this.stream = stream;
@@ -782,6 +787,7 @@ public class TomcatManager
throw new IllegalArgumentException( "Output stream may not be
null" );
}
transferInitiated( this.url );
+this.startTime = System.currentTimeMillis();
try
{
byte[] buffer = new byte[BUFFER_SIZE];
@@ -814,6 +820,7 @@ public class TomcatManager
transferProgressed( completed, this.length );
}
}
+transferSucceeded( completed );
}
finally
{
@@ -842,23 +849,30 @@ public class TomcatManager
StringBuilder buffer = new StringBuilder( 64 );
buffer.append( getStatus( completedSize, totalSize ) ).append( "
" );
-
-int pad = lastLength - buffer.length();
lastLength = buffer.length();
-pad( buffer, pad );
buffer.append( '\r' );
out.print( buffer );
}
-private void pad( StringBuilder buffer, int spaces )
+public void transferSucceeded( long contentLength )
{
-String block = "";
-while ( spaces > 0 )
+
+if ( contentLength >= 0 )
{
-int n = Math.min( spaces, block.length() );
-buffer.append( block, 0, n );
-spaces -= n;
+String type = "Uploaded";
+String len = contentLength >= 1024 ? toKB( contentLength ) + "
KB" : contentLength + " B";
+
+String throughput = "";
+long duration = System.currentTimeMillis() - startTime;
+if ( duration > 0 )
+{
+DecimalFormat format = new DecimalFormat( "0.0", new
DecimalFormatSymbols( Locale.ENGLISH ) );
+double kbPerSec = ( contentLength / 1024.0 ) / ( duration
/ 1000.0 );
+throughput = " at " + format.format( kbPerSec ) + "
KB/sec";
+}
+
+out.println( type + ": " + url + " (" + len + throughput + ")"
);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212877 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugi
Author: olamy
Date: Sat Dec 10 21:07:36 2011
New Revision: 1212877
URL: http://svn.apache.org/viewvc?rev=1212877&view=rev
Log:
log http status code and reason phrase returned after a deployment
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212877&r1=1212876&r2=1212877&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Sat Dec 10 21:07:36 2011
@@ -38,6 +38,7 @@ import org.apache.http.impl.client.Basic
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.BasicClientConnectionManager;
import org.apache.http.protocol.BasicHttpContext;
+import org.apache.maven.plugin.logging.Log;
import java.io.IOException;
import java.io.InputStream;
@@ -96,8 +97,14 @@ public class TomcatManager
*/
private String userAgent;
+/**
+ * @since 2.0
+ */
private DefaultHttpClient httpClient;
+/**
+ * @since 2.0
+ */
private BasicHttpContext localContext;
// --
@@ -896,11 +903,10 @@ public class TomcatManager
}
}
-protected long toKB( long bytes )
+private long toKB( long bytes )
{
return ( bytes + 1023 ) / 1024;
}
-
}
}
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java?rev=1212877&r1=1212876&r2=1212877&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
Sat Dec 10 21:07:36 2011
@@ -225,7 +225,6 @@ public abstract class AbstractCatalinaMo
{
userName = this.username;
password = this.password == null ? "" : this.password;
-//getLog( ).debug( "user user/password " + userName + "/" +
password );
}
manager = new TomcatManager( url, userName, password, charset );
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java?rev=1212877&r1=1212876&r2=1212877&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
Sat Dec 10 21:07:36 2011
@@ -21,6 +21,7 @@ package org.apache.tomcat.maven.plugin.t
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
+import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
import java.io.File;
import java.io.FileInputStream;
@@ -84,7 +85,12 @@ public class AbstractDeployWarMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingWar", getDeployedURL() ) );
-log( getManager().deploy( getPath(), new FileInputStream( warFile ),
isUpdate(), getTag(),
- warFile.length() ).getHttpResponseBody() );
+TomcatManagerResponse tomcatManagerResponse =
+getManager().deploy( getPath(), new FileInputStream( warFile ),
isUpdate(), ge
svn commit: r1220657 - /tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml
Author: olamy Date: Mon Dec 19 08:50:05 2011 New Revision: 1220657 URL: http://svn.apache.org/viewvc?rev=1220657&view=rev Log: dependency on ClusterRuleSet has been removed and now really optionnal, no more need of this hack Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml?rev=1220657&r1=1220656&r2=1220657&view=diff == --- tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml (original) +++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml Mon Dec 19 08:50:05 2011 @@ -105,12 +105,6 @@ - - - - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1220674 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ tomcat7-war-runner/ tomcat7-war-runner/src/main/java/org/apache/tom
Author: olamy
Date: Mon Dec 19 10:01:21 2011
New Revision: 1220674
URL: http://svn.apache.org/viewvc?rev=1220674&view=rev
Log:
[MTOMCAT-109] nio protocol is impossible to use with tomcat exec mojo.
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=1220674&r1=1220673&r2=1220674&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 Dec 19 10:01:21 2011
@@ -219,6 +219,13 @@ public abstract class AbstractExecWarMoj
*/
private String mainClass;
+/**
+ * which connector protocol to use HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol
+ * @parameter expression="${maven.tomcat.exec.war.connectorHttpProtocol}"
default-value="HTTP/1.1"
+ * @required
+ */
+private String connectorHttpProtocol;
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -269,6 +276,7 @@ public abstract class AbstractExecWarMoj
// * enableNaming=true/false
// * wars=foo.war|contextpath;bar.war ( |contextpath is
optionnal if empty use the war name )
// * accessLogValveFormat=
+// * connectorhttpProtocol: HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol
//* optionnal: conf/ with usual tomcat configuration files
//* MANIFEST with Main-Class
@@ -276,6 +284,7 @@ public abstract class AbstractExecWarMoj
properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString(
enableNaming ) );
properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY,
accessLogValveFormat );
+properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY,
connectorHttpProtocol );
os = new ArchiveStreamFactory().createArchiveOutputStream(
ArchiveStreamFactory.JAR,
execWarJarOutputStream );
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=1220674&r1=1220673&r2=1220674&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT Mon Dec 19 10:01:21
2011
@@ -24,6 +24,7 @@ The generated standalone jar will contai
* wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty
use the war name)
* enableNaming=true/false
* accessLogValveFormat=
+ * connectorhttpProtocol: HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol
* 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=1220674&r1=1220673&r2=1220674&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 Dec 19 10:01:21 2011
@@ -57,6 +57,11 @@ public class Tomcat7Runner
public static final String ACCESS_LOG_VALVE_FORMAT_KEY =
"accessLogValveFormat";
+/**
+ * key of the property which contains http protocol : HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol
+ */
+public static final String HTTP_PROTOCOL_KEY = "connectorhttpProtocol";
+
public int httpPort;
@@ -143,7 +148,11 @@ public class Tomcat7Runner
tomcat.getHost().setAppBase( new File( extractDirectory, "webapps"
).getAbsolutePath() );
-Connector connector = new Connector( "HTTP/1.1" );
+String connectorHttpProtocol = runtimeProperties.getProperty(
HT
svn commit: r1220675 - in /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner: Tomcat7Runner.java Tomcat7RunnerCli.java
Author: olamy
Date: Mon Dec 19 10:01:34 2011
New Revision: 1220675
URL: http://svn.apache.org/viewvc?rev=1220675&view=rev
Log:
[MTOMCAT-109] nio protocol is impossible to use with tomcat exec mojo.
add an option in tomcat runner to override it tru cli
-httpProtocol
as it can be change on application start not only in the produced jar.
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=1220675&r1=1220674&r2=1220675&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 Dec 19 10:01:34 2011
@@ -77,6 +77,8 @@ public class Tomcat7Runner
public boolean debug = false;
+public String httpProtocol;
+
public File extractDirectory = new File( ".extract" );
Catalina container;
@@ -150,6 +152,11 @@ public class Tomcat7Runner
String connectorHttpProtocol = runtimeProperties.getProperty(
HTTP_PROTOCOL_KEY );
+if ( httpProtocol != null && httpProtocol.trim().length() > 0 )
+{
+connectorHttpProtocol = httpProtocol;
+}
+
debugMessage( "use connectorHttpProtocol:" + connectorHttpProtocol
);
Connector connector = new Connector( connectorHttpProtocol );
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=1220675&r1=1220674&r2=1220675&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
Mon Dec 19 10:01:34 2011
@@ -65,12 +65,15 @@ public class Tomcat7RunnerCli
static Option sysProps = OptionBuilder.withDescription( "use value for
given property" ).hasArgs().withDescription(
"key=value" ).withValueSeparator().create( 'D' );
+static Option httpProtocol = OptionBuilder.withArgName( "httpProtocol"
).hasArg().withDescription(
+"http protocol to use: HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol" ).create( "httpProtocol" );
+
static Options options = new Options();
static
{
options.addOption( httpPort ).addOption( httpsPort ).addOption(
ajpPort ).addOption( serverXmlPath ).addOption(
-resetExtract ).addOption( help ).addOption( debug ).addOption(
sysProps );
+resetExtract ).addOption( help ).addOption( debug ).addOption(
sysProps ).addOption( httpProtocol );
}
@@ -128,6 +131,11 @@ public class Tomcat7RunnerCli
tomcat7Runner.debug = true;
}
+if ( line.hasOption( httpProtocol.getOpt() ) )
+{
+tomcat7Runner.httpProtocol = line.getOptionValue(
httpProtocol.getOpt() );
+}
+
if ( line.hasOption( sysProps.getOpt() ) )
{
Properties systemProperties = line.getOptionProperties(
sysProps.getOpt() );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1221022 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomca
Author: olamy
Date: Mon Dec 19 23:50:35 2011
New Revision: 1221022
URL: http://svn.apache.org/viewvc?rev=1221022&view=rev
Log:
ensure we correctly start https connector with tomcat*:run
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=1221022&r1=1221021&r2=1221022&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 Dec 19 23:50:35 2011
@@ -741,6 +741,10 @@ public abstract class AbstractRunMojo
if ( httpsPort > 0 )
{
Connector httpsConnector = container.createConnector(
(InetAddress) null, httpsPort, true );
+httpsConnector.setSecure( true );
+httpsConnector.setProperty( "SSLEnabled", "true" );
+// should be default but configure it anyway
+httpsConnector.setProperty( "sslProtocol", "TLS" );
if ( keystoreFile != null )
{
httpsConnector.setAttribute( "keystoreFile",
keystoreFile );
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=1221022&r1=1221021&r2=1221022&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 Dec 19 23:50:35 2011
@@ -728,9 +728,12 @@ public abstract class AbstractRunMojo
{
Connector httpsConnector = new Connector( protocol );
httpsConnector.setPort( httpsPort );
+httpsConnector.setSecure( true );
+httpsConnector.setProperty( "SSLEnabled", "true" );
+// should be default but configure it anyway
+httpsConnector.setProperty( "sslProtocol", "TLS" );
if ( keystoreFile != null )
{
-
httpsConnector.setAttribute( "keystoreFile",
keystoreFile );
}
if ( keystorePass != null )
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1221023 - in /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner: PasswordUtil.java Tomcat7Runner.java Tomcat7RunnerCli.java
Author: olamy
Date: Mon Dec 19 23:50:50 2011
New Revision: 1221023
URL: http://svn.apache.org/viewvc?rev=1221023&view=rev
Log:
[MTOMCAT-108] The httpsPort flag starts another http thread not an https thread
Submitted by Brad Giaccio.
Added:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
(with props)
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
Added:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java?rev=1221023&view=auto
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
(added)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
Mon Dec 19 23:50:50 2011
@@ -0,0 +1,131 @@
+package org.apache.tomcat.maven.runner;
+
+/*
+ * 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.
+ */
+
+import java.util.Properties;
+
+
+/**
+ * Password obfuscate utility class. Lifted from Jetty
org.mortbay.jetty.security.Password
+ *
+ *
+ * Passwords that begin with OBF: are de obfuscated.
+ *
+ * Passwords can be obfuscated by running Obfuscate as a main class.
Obfuscated password are required if a system needs
+ * to recover the full password (eg. so that it may be passed to another
system).
+ *
+ * They are not secure, but prevent casual observation.
+ *
+ * @see http://grepcode.com/file_/repo1.maven.org/maven2/org.mortbay.jetty/jetty/6.1.11/org/mortbay/jetty/security/Password.java/?v=source";
+ * >Jetty Source org.mortbay.jetty.security.Password
+ * @since 2.0
+ */
+public class PasswordUtil
+{
+public static final String __OBFUSCATE = "OBF:";
+
+/* */
+public static String obfuscate( String s )
+{
+StringBuilder buf = new StringBuilder();
+byte[] b = s.getBytes();
+
+buf.append( __OBFUSCATE );
+for ( int i = 0; i < b.length; i++ )
+{
+byte b1 = b[i];
+byte b2 = b[s.length() - ( i + 1 )];
+int i1 = 127 + b1 + b2;
+int i2 = 127 + b1 - b2;
+int i0 = i1 * 256 + i2;
+String x = Integer.toString( i0, 36 );
+
+switch ( x.length() )
+{
+case 1:
+buf.append( '0' );
+case 2:
+buf.append( '0' );
+case 3:
+buf.append( '0' );
+default:
+buf.append( x );
+}
+}
+return buf.toString();
+
+}
+
+/* */
+public static String deobfuscate( String s )
+{
+if ( s.startsWith( __OBFUSCATE ) )
+{
+s = s.substring( __OBFUSCATE.length() );
+
+byte[] b = new byte[s.length() / 2];
+int l = 0;
+for ( int i = 0; i < s.length(); i += 4 )
+{
+String x = s.substring( i, i + 4 );
+int i0 = Integer.parseInt( x, 36 );
+int i1 = ( i0 / 256 );
+int i2 = ( i0 % 256 );
+b[l++] = (byte) ( ( i1 + i2 - 254 ) / 2 );
+}
+return new String( b, 0, l );
+}
+else
+{
+return s;
+}
+
+}
+
+public static void deobfuscateSystemProps()
+{
+Properties props = System.getProperties();
+for ( Object obj : props.keySet() )
+{
+if ( obj instanceof String )
+{
+String key = (String) obj;
+String value = (String)
svn commit: r1221719 - in /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner: Tomcat7Runner.java Tomcat7RunnerCli.java
Author: olamy
Date: Wed Dec 21 13:34:54 2011
New Revision: 1221719
URL: http://svn.apache.org/viewvc?rev=1221719&view=rev
Log:
[MTOMCAT-111] Make extract directory configurable
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=1221719&r1=1221718&r2=1221719&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 Dec 21 13:34:54 2011
@@ -77,13 +77,15 @@ public class Tomcat7Runner
public boolean debug = false;
- public boolean clientAuth = false;
-
- public String keyAlias = null;
+public boolean clientAuth = false;
+
+public String keyAlias = null;
public String httpProtocol;
-public File extractDirectory = new File( ".extract" );
+public String extractDirectory = ".extract";
+
+public File extractDirectoryFile;
Catalina container;
@@ -103,8 +105,21 @@ public class Tomcat7Runner
throws Exception
{
- PasswordUtil.deobfuscateSystemProps();
-
+PasswordUtil.deobfuscateSystemProps();
+
+this.extractDirectoryFile = new File( this.extractDirectory );
+if ( !this.extractDirectoryFile.exists() )
+{
+boolean create = this.extractDirectoryFile.mkdirs();
+if ( !create )
+{
+System.out.println( "FATAL: impossible to create directory:" +
this.extractDirectoryFile.getPath() );
+System.exit( 1 );
+}
+}
+
+debugMessage( "use extractDirectory:" + extractDirectoryFile.getPath()
);
+
// do we have to extract content
if ( !new File( ".extract" ).exists() || resetExtract )
{
@@ -126,8 +141,8 @@ public class Tomcat7Runner
System.setProperty( "java.io.tmpdir", tmpDir.getAbsolutePath() );
-System.setProperty( "catalina.base",
extractDirectory.getAbsolutePath() );
-System.setProperty( "catalina.home",
extractDirectory.getAbsolutePath() );
+System.setProperty( "catalina.base",
extractDirectoryFile.getAbsolutePath() );
+System.setProperty( "catalina.home",
extractDirectoryFile.getAbsolutePath() );
// start with a server.xml
if ( serverXmlPath != null || useServerXml() )
@@ -165,21 +180,21 @@ public class Tomcat7Runner
debugMessage( "use connectorHttpProtocol:" + connectorHttpProtocol
);
- if (httpPort > 0)
- {
- Connector connector = new Connector( connectorHttpProtocol
);
- connector.setPort( httpPort );
-
- if ( httpsPort > 0 )
- {
- connector.setRedirectPort( httpsPort );
- }
- // FIXME parameter for that def ? ISO-8859-1
- //connector.setURIEncoding(uriEncoding);
+if ( httpPort > 0 )
+{
+Connector connector = new Connector( connectorHttpProtocol );
+connector.setPort( httpPort );
- tomcat.getService().addConnector( connector );
+if ( httpsPort > 0 )
+{
+connector.setRedirectPort( httpsPort );
+}
+// FIXME parameter for that def ? ISO-8859-1
+//connector.setURIEncoding(uriEncoding);
+
+tomcat.getService().addConnector( connector );
- tomcat.setConnector( connector );
+tomcat.setConnector( connector );
}
// add a default acces log valve
@@ -193,43 +208,46 @@ public class Tomcat7Runner
{
Connector httpsConnector = new Connector(
connectorHttpProtocol );
httpsConnector.setPort( httpsPort );
-httpsConnector.setSecure(true);
-httpsConnector.setProperty("SSLEnabled", "true");
-httpsConnector.setProperty("sslProtocol", "TLS");
-
-String keystoreFile =
System.getProperty("javax.net.ssl.keyStore");
