svn commit: r1635429 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationPart.java webapps/docs/changelog.xml
Author: remm
Date: Thu Oct 30 08:37:01 2014
New Revision: 1635429
URL: http://svn.apache.org/r1635429
Log:
Fileupload respects header ordering, but the part implementation doesn't. Also
use a linked collection there to fix the discrepancy.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java?rev=1635429&r1=1635428&r2=1635429&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java Thu Oct 30
08:37:01 2014
@@ -22,8 +22,8 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Map;
@@ -69,7 +69,7 @@ public class ApplicationPart implements
@Override
public Collection getHeaderNames() {
if (fileItem instanceof DiskFileItem) {
-HashSet headerNames = new HashSet<>();
+LinkedHashSet headerNames = new LinkedHashSet<>();
Iterator iter =
((DiskFileItem) fileItem).getHeaders().getHeaderNames();
while (iter.hasNext()) {
@@ -83,7 +83,7 @@ public class ApplicationPart implements
@Override
public Collection getHeaders(String name) {
if (fileItem instanceof DiskFileItem) {
-HashSet headers = new HashSet<>();
+LinkedHashSet headers = new LinkedHashSet<>();
Iterator iter =
((DiskFileItem) fileItem).getHeaders().getHeaders(name);
while (iter.hasNext()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1635429&r1=1635428&r2=1635429&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 30 08:37:01 2014
@@ -195,6 +195,10 @@
have a docBase on the file system. This is primarily intended for use
when embedding. (markt)
+
+Propagate header ordering from fileupload to the part implementation.
+(remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635431 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
Author: remm
Date: Thu Oct 30 08:42:17 2014
New Revision: 1635431
URL: http://svn.apache.org/r1635431
Log:
Disable chunking when there's no keepalive (for example when the request
specified connection close, which is detected).
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1635431&r1=1635430&r2=1635431&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Oct 30 08:42:17 2014
@@ -1478,7 +1478,7 @@ public abstract class AbstractHttp11Proc
// If the response code supports an entity body and we're on
// HTTP 1.1 then we chunk unless we have a Connection: close header
connectionClosePresent = isConnectionClose(headers);
-if (entityBody && http11 && !connectionClosePresent) {
+if (entityBody && http11 && keepAlive && !connectionClosePresent) {
getOutputBuffer().addActiveFilter
(outputFilters[Constants.CHUNKED_FILTER]);
contentDelimitation = true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1635431&r1=1635430&r2=1635431&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 30 08:42:17 2014
@@ -238,6 +238,10 @@
Async state MUST_COMPLETE should still be started. (remm)
+
+Disable chunking when there is no keepalive (connection close is added
+at the end of the method). (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1635431 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
2014-10-30 9:42 GMT+01:00 : > Author: remm > Date: Thu Oct 30 08:42:17 2014 > New Revision: 1635431 > > URL: http://svn.apache.org/r1635431 > Log: > Disable chunking when there's no keepalive (for example when the request > specified connection close, which is detected). > > IMO although chunking can be disabled and can be considered more costly, it removes the possibility to detect truncated responses (or requests, but it's up to the client to use it or not). So using a system property to disable this could be worthwhile. Rémy
Re: svn commit: r1635154 - in /tomcat/trunk: java/org/apache/tomcat/util/scan/StandardJarScanner.java test/org/apache/catalina/filters/TesterServletContext.java test/org/apache/tomcat/util/scan/TestSt
On 30/10/2014 00:33, Konstantin Kolinko wrote: > 2014-10-29 17:42 GMT+03:00 : >> Author: markt >> Date: Wed Oct 29 14:42:01 2014 >> New Revision: 1635154 >> >> URL: http://svn.apache.org/r1635154 >> Log: >> URLs may be added directly to the web application's class path. ensure that >> they are scanned if a StandardJarScanner is configured to scan the class >> path. >> >> Added: >> >> tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java >> (with props) >> Modified: >> tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java >> tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java >> tomcat/trunk/webapps/docs/changelog.xml >> > > (It was a fix for > https://issues.apache.org/bugzilla/show_bug.cgi?id=57153 > ) > > > I suspect that this change is the trigger for breakage of > org.apache.jasper.servlet.TestTldScanner test. I agree. I was looking at this last night and reached the same conclusion. >From memory, before the WebResource refactoring that simplified this code there was a check that ensured that WEB-INF/classes and JARs from WEB-INF/lib were excluded from the class path scan. I think that check needs to be restored a) to address this issue and b) to make the scan more efficient. > The logs are: > > http://ci.apache.org/projects/tomcat/tomcat8/logs/1635250/TEST-org.apache.jasper.servlet.TestTldScanner.NIO2.txt > > [[[ > Caused by: java.lang.IllegalArgumentException: The resource path > [null/META-INF/bug55807.tld] is not valid > at > org.apache.catalina.webresources.StandardRoot.validate(StandardRoot.java:250) > at > org.apache.catalina.webresources.StandardRoot.getResource(StandardRoot.java:212) > at > org.apache.catalina.webresources.StandardRoot.getResource(StandardRoot.java:206) > at > org.apache.catalina.core.ApplicationContext.getResource(ApplicationContext.java:533) > at > org.apache.catalina.core.ApplicationContextFacade.getResource(ApplicationContextFacade.java:199) > at org.apache.jasper.compiler.TldCache.getLastModified(TldCache.java:128) > at org.apache.jasper.compiler.TldCache.(TldCache.java:70) > at > org.apache.jasper.servlet.JasperInitializer.onStartup(JasperInitializer.java:113) > at > org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5185) > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) > ... 7 more > ]]] > > > I debugged with breakpoint at "TldResourcePath(URL url, String > webappPath, String entryName)" constructor (TldResourcePath: line 65) > > It is called with the following arguments: > - url: file:/<...>trunk/test/webapp/WEB-INF/classes/META-INF/bug55807.tld > - webappPath: null/META-INF/bug55807.tld > - entryName: null > > Stacktrace at constructor call: > [[[ > Daemon Thread [localhost-startStop-1] (Suspended (breakpoint at line > 65 in TldResourcePath)) > owns: StandardContext (id=33) > TldResourcePath.(URL, String, String) line: 65 > TldResourcePath.(URL, String) line: 54 > TldScanner$TldScannerCallback$1.visitFile(Path, > BasicFileAttributes) line: 342 > TldScanner$TldScannerCallback$1.visitFile(Object, > BasicFileAttributes) line: 1 > FileTreeWalker.walk(Path, int, List) line: 135 > FileTreeWalker.walk(Path, int, List) line: 199 > FileTreeWalker.walk(Path) line: 69 > Files.walkFileTree(Path, Set, int, > FileVisitor) line: 2602 > Files.walkFileTree(Path, FileVisitor) line: 2635 > TldScanner$TldScannerCallback.scan(File, String, boolean) line: 323 > StandardJarScanner.process(JarScanType, JarScannerCallback, URL, > String, boolean) line: 315 > StandardJarScanner.scan(JarScanType, ServletContext, > JarScannerCallback) line: 227 > TldScanner.scanJars() line: 240 > TldScanner.scan() line: 99 > JasperInitializer.onStartup(Set>, ServletContext) line: 103 > StandardContext.startInternal() line: 5185 > StandardContext(LifecycleBase).start() line: 150 > ContainerBase$StartChild.call() line: 1409 > ContainerBase$StartChild.call() line: 1 > FutureTask.run() line: 262 > ThreadPoolExecutor.runWorker(ThreadPoolExecutor$Worker) line: 1145 > ThreadPoolExecutor$Worker.run() line: 615 > Thread.run() line: 745 > ]]] > > Note the following lines in stacktrace: > > TldScanner$TldScannerCallback.scan(File, String, boolean) line: 323 > StandardJarScanner.process(JarScanType, JarScannerCallback, URL, > String, boolean) line: 315 > StandardJarScanner.scan(JarScanType, ServletContext, > JarScannerCallback) line: 227 > > At StandardJarScanner line 227 it is: > [[[ >process(scanType, callback, urls[i], null, isWebapp); > ]]] > > where "null" is explicitly passed as the value of "webappPath". > The "null" value is passed into StandardJarScanner.process() and > further into TldScanner$TldScannerCallback.scan(), see the above 3 > lines of stacktrace. > > TldScanner line 338: > String resourcePath = webappPath + "/" + subPath; > > results i
svn commit: r1635440 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: markt
Date: Thu Oct 30 09:28:30 2014
New Revision: 1635440
URL: http://svn.apache.org/r1635440
Log:
Update comment as a result of r1635431.
Fix some formatting nits spotted while reviewing r1635431
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1635440&r1=1635439&r2=1635440&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Oct 30 09:28:30 2014
@@ -1275,7 +1275,7 @@ public abstract class AbstractHttp11Proc
}
// Check user-agent header
-if ((restrictedUserAgents != null) && ((http11) || (keepAlive))) {
+if (restrictedUserAgents != null && (http11 || keepAlive)) {
MessageBytes userAgentValueMB = headers.getValue("user-agent");
// Check in the restricted list, and adjust the http11
// and keepAlive flags accordingly
@@ -1313,7 +1313,6 @@ public abstract class AbstractHttp11Proc
hostMB.setBytes(uriB, uriBCStart + pos + 3,
slashPos - pos - 3);
}
-
}
// Input filter setup
@@ -1476,7 +1475,8 @@ public abstract class AbstractHttp11Proc
contentDelimitation = true;
} else {
// If the response code supports an entity body and we're on
-// HTTP 1.1 then we chunk unless we have a Connection: close header
+// HTTP 1.1 and we are using keep-alive then we chunk unless we
have
+// a Connection: close header
connectionClosePresent = isConnectionClose(headers);
if (entityBody && http11 && keepAlive && !connectionClosePresent) {
getOutputBuffer().addActiveFilter
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1635431 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
On 30/10/2014 08:46, Rémy Maucherat wrote: > 2014-10-30 9:42 GMT+01:00 : > >> Author: remm >> Date: Thu Oct 30 08:42:17 2014 >> New Revision: 1635431 >> >> URL: http://svn.apache.org/r1635431 >> Log: >> Disable chunking when there's no keepalive (for example when the request >> specified connection close, which is detected). >> > IMO although chunking can be disabled and can be considered more costly, > it removes the possibility to detect truncated responses (or requests, but > it's up to the client to use it or not). So using a system property to > disable this could be worthwhile. Was it just the cost of the chunking that triggered this change or was it something else? If it was performance, how much difference does this change make? Looking at the code, I can see a couple of places where this changes behaviour: - If the client requests the connection is closed - If the request is the last one before the connection is closed due to reaching the maximum number of keep-alive requests We have had bug reports in the past about not being able to detect a truncated response. I suspect the current unit tests for those miss the second case above which is my main concern right now. I don't think a system property is the right way to handle configuration of this feature (if such configuration is required). There is no reason it could not be a connector attribute. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635444 - /tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Author: markt
Date: Thu Oct 30 10:00:20 2014
New Revision: 1635444
URL: http://svn.apache.org/r1635444
Log:
Use getters. No functional change.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1635444&r1=1635443&r2=1635444&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Thu
Oct 30 10:00:20 2014
@@ -146,7 +146,7 @@ public class StandardJarScanner implemen
while (it.hasNext()) {
String path = it.next();
if (path.endsWith(Constants.JAR_EXT) &&
-jarScanFilter.check(scanType,
+getJarScanFilter().check(scanType,
path.substring(path.lastIndexOf('/')+1))) {
// Need to scan this JAR
if (log.isDebugEnabled()) {
@@ -168,7 +168,7 @@ public class StandardJarScanner implemen
}
// Scan WEB-INF/classes
-if (scanAllDirectories) {
+if (isScanAllDirectories()) {
try {
URL url = context.getResource("/WEB-INF/classes/META-INF");
if (url != null) {
@@ -184,13 +184,13 @@ public class StandardJarScanner implemen
}
// Scan the classpath
-if (scanClassPath) {
+if (isScanClassPath()) {
if (log.isTraceEnabled()) {
log.trace(sm.getString("jarScan.classloaderStart"));
}
ClassLoader stopLoader = null;
-if (!scanBootstrapClassPath) {
+if (!isScanBootstrapClassPath()) {
// Stop when we reach the bootstrap class loader
stopLoader = ClassLoader.getSystemClassLoader().getParent();
}
@@ -217,7 +217,7 @@ public class StandardJarScanner implemen
if ((cpe.isJar() ||
scanType == JarScanType.PLUGGABILITY ||
isScanAllDirectories()) &&
-jarScanFilter.check(scanType,
+getJarScanFilter().check(scanType,
cpe.getName())) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(
@@ -299,7 +299,7 @@ public class StandardJarScanner implemen
File f;
try {
f = new File(url.toURI());
-if (f.isFile() && scanAllFiles) {
+if (f.isFile() && isScanAllFiles()) {
// Treat this file as a JAR
URL jarURL = new URL("jar:" + urlStr + "!/");
callback.scan(
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635449 - /tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Author: markt
Date: Thu Oct 30 10:11:02 2014
New Revision: 1635449
URL: http://svn.apache.org/r1635449
Log:
Follow-up to r1635154.
When scanning the class path, exclude WEB-INF/classes if it has already been
scanned and exclude JARs from WEB-INF/lib that have been scanned.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1635449&r1=1635448&r2=1635449&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Thu
Oct 30 10:11:02 2014
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -139,6 +140,8 @@ public class StandardJarScanner implemen
log.trace(sm.getString("jarScan.webinflibStart"));
}
+Set processedURLs = new HashSet<>();
+
// Scan WEB-INF/lib
Set dirList = context.getResourcePaths(Constants.WEB_INF_LIB);
if (dirList != null) {
@@ -155,6 +158,7 @@ public class StandardJarScanner implemen
URL url = null;
try {
url = context.getResource(path);
+processedURLs.add(url);
process(scanType, callback, url, path, true);
} catch (IOException e) {
log.warn(sm.getString("jarScan.webinflibFail", url),
e);
@@ -172,6 +176,14 @@ public class StandardJarScanner implemen
try {
URL url = context.getResource("/WEB-INF/classes/META-INF");
if (url != null) {
+// Class path scanning will look at WEB-INF/classes since
+// that is the URL that Tomcat's web application class
+// loader returns. Therefore, it is this URL that needs to
+// be added to the set of processed URLs.
+URL webInfURL = context.getResource("/WEB-INF/classes");
+if (webInfURL != null) {
+processedURLs.add(webInfURL);
+}
try {
callback.scanWebInfClasses();
} catch (IOException e) {
@@ -208,6 +220,11 @@ public class StandardJarScanner implemen
}
URL[] urls = ((URLClassLoader) classLoader).getURLs();
for (int i=0; i
svn commit: r1635456 - /tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Author: markt
Date: Thu Oct 30 10:27:44 2014
New Revision: 1635456
URL: http://svn.apache.org/r1635456
Log:
Fix bug highlighted by test case failure after r1635154. If the webappPath is
null, the resourcePath should be null.
Also fix some Java8 Javadoc issues.
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1635456&r1=1635455&r2=1635456&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Thu Oct 30
10:27:44 2014
@@ -66,9 +66,16 @@ public class TldScanner {
private final List listeners = new ArrayList<>();
/**
- * Initialize with the application's ServletContext.
+ * Initialise with the application's ServletContext.
*
- * @param context the application's servletContext
+ * @param contextthe application's servletContext
+ * @param namespaceAware should the XML parser used to parse TLD files be
+ * configured to be name space aware
+ * @param validation should the XML parser used to parse TLD files be
+ * configured to use validation
+ * @param blockExternal should the XML parser used to parse TLD files be
+ * configured to be block references to external
+ * entities
*/
public TldScanner(ServletContext context,
boolean namespaceAware,
@@ -129,7 +136,10 @@ public class TldScanner {
/**
* Set the class loader used by the digester to create objects as a result
- * of this scan. Normally this only needs tobe set when using JspC.
+ * of this scan. Normally this only needs to be set when using JspC.
+ *
+ * @param classLoader Class loader to use when creating new objects while
+ *parsing TLDs
*/
public void setClassLoader(ClassLoader classLoader) {
tldParser.setClassLoader(classLoader);
@@ -330,12 +340,17 @@ public class TldScanner {
return FileVisitResult.CONTINUE;
}
-String subPath = file.subpath(
-filePath.getNameCount(),
file.getNameCount()).toString();
-if ('/' != File.separatorChar) {
-subPath = subPath.replace(File.separatorChar, '/');
+String resourcePath;
+if (webappPath == null) {
+resourcePath = null;
+} else {
+String subPath = file.subpath(
+filePath.getNameCount(),
file.getNameCount()).toString();
+if ('/' != File.separatorChar) {
+subPath = subPath.replace(File.separatorChar, '/');
+}
+resourcePath = webappPath + "/" + subPath;
}
-String resourcePath = webappPath + "/" + subPath;
try {
URL url = file.toUri().toURL();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1635154 - in /tomcat/trunk: java/org/apache/tomcat/util/scan/StandardJarScanner.java test/org/apache/catalina/filters/TesterServletContext.java test/org/apache/tomcat/util/scan/TestSt
On 30/10/2014 08:48, Mark Thomas wrote: > On 30/10/2014 00:33, Konstantin Kolinko wrote: >> 2014-10-29 17:42 GMT+03:00 : >>> Author: markt >>> Date: Wed Oct 29 14:42:01 2014 >>> New Revision: 1635154 >>> >>> URL: http://svn.apache.org/r1635154 >>> Log: >>> URLs may be added directly to the web application's class path. ensure that >>> they are scanned if a StandardJarScanner is configured to scan the class >>> path. >>> >>> Added: >>> >>> tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java >>> (with props) >>> Modified: >>> tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java >>> tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java >>> tomcat/trunk/webapps/docs/changelog.xml >>> >> >> (It was a fix for >> https://issues.apache.org/bugzilla/show_bug.cgi?id=57153 >> ) >> >> >> I suspect that this change is the trigger for breakage of >> org.apache.jasper.servlet.TestTldScanner test. > > I agree. I was looking at this last night and reached the same conclusion. I've fixed the duplicate scanning of WEB-INF/lib/*.jar and WEB-INF/classes that uncovered this bug. >> It may be that this bug did exist before, but that code path in >> StandardJarScanner just was not executed. > > That null doesn't look right. One of this morning's jobs is to look at that. Yep. It was a bug. Also fixed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635460 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Oct 30 10:34:39 2014 New Revision: 1635460 URL: http://svn.apache.org/r1635460 Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1635460&r1=1635459&r2=1635460&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 30 10:34:39 2014 @@ -296,6 +296,11 @@ coerce the empty string to null if the PropertyEditor throws an exception. (kkolinko/markt) + +57153: Correctly scan for TLDs located in directories that +represent exanded JARs files that have been added to the web application +class loader's class path. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1635431 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
2014-10-30 10:42 GMT+01:00 Mark Thomas : > Was it just the cost of the chunking that triggered this change or was > it something else? If it was performance, how much difference does this > change make? > Debugging something else, this turned out to not cause a failure, it was the reversed header order that caused the problem. > > Looking at the code, I can see a couple of places where this changes > behaviour: > - If the client requests the connection is closed > Yes, that was this situation, the client sends a connection close. But in that case connection close is also added to the response (right after this code) so the behavior is consistent. > - If the request is the last one before the connection is closed due to > reaching the maximum number of keep-alive requests > > We have had bug reports in the past about not being able to detect a > truncated response. I suspect the current unit tests for those miss the > second case above which is my main concern right now. > > I don't think a system property is the right way to handle configuration > of this feature (if such configuration is required). There is no reason > it could not be a connector attribute. > IMO the new attribute should also do the same thing for connection close in the response. The default should be to not chunk if closing (as is right now). Ok, so since you're complaining about every commit, next fix you'll scream more since the upgrade process is not correct (no handling of leftover input bytes, anything included in the same packet that the request header is lost - I would agree it's questionable client behavior though). This means adding code to pass around a ByteBuffer to the upgraded processor to add as input since I see no other way :) Yum. Rémy
[jira] [Updated] (MTOMCAT-284) Add a skip parameter to deploy/redeploy/undeploy goals
[
https://issues.apache.org/jira/browse/MTOMCAT-284?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-284:
Attachment: MTOMCAT-284.patch
Here is a patch that adds a skip parameter to the container goals for tomcat 6
and tomcat 7 plugins. I have used the same parameter name, default value and
command line parameter that the Run mojos already have.
> Add a skip parameter to deploy/redeploy/undeploy goals
> --
>
> Key: MTOMCAT-284
> URL: https://issues.apache.org/jira/browse/MTOMCAT-284
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
>Affects Versions: 2.2
>Reporter: Dennis Lundberg
> Attachments: MTOMCAT-284.patch
>
>
> Our use case for this is a multi module project with one overlay module (with
> war packaging) and other war modules that use the first one as an overlay.
> {noformat}
> root
> +-- overlay-war
> +-- app1-war
> +-- app2-war
> {noformat}
> So app1-war and app2-war uses overlay-war as a war-type dependency to use it
> as an overlay.
> We want to use the tomcat-maven-plugin to deploy/redeploy/undeploy app1-war
> and app2-war to a Tomcat instance. However we do not want to
> deploy/redeploy/undeploy overlay-war.
> This could be fixed by adding a skip parameter that we could apply to the
> overlay-war configuration. There is a skip parameter already in the plugin
> for other goals like "run".
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-286) Integration test fails on Windows
Dennis Lundberg created MTOMCAT-286:
---
Summary: Integration test fails on Windows
Key: MTOMCAT-286
URL: https://issues.apache.org/jira/browse/MTOMCAT-286
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.2
Environment: Windows 7
Reporter: Dennis Lundberg
Assignee: Olivier Lamy (*$^¨%`£)
The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail on
Windows. The reason for the failure is that the {{JarArchiveEntry}} that is
created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}} contains
platform specific path separators, i.e. '\'. The integration test requires that
all path separators are '/'.
According to
http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
path separators should be '/' and nothing else. So the fix is to transform the
path separators of the included file before its name is added to the archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-286) Integration test fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-286?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-286:
Attachment: MTOMCAT-286.patch
Patch that fixes the problem in AbstractExecWarMojo. As far as I can tell there
is no equivalent to this Mojo in tomcat6-maven-plugin.
> Integration test fails on Windows
> -
>
> Key: MTOMCAT-286
> URL: https://issues.apache.org/jira/browse/MTOMCAT-286
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
> Attachments: MTOMCAT-286.patch
>
>
> The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail
> on Windows. The reason for the failure is that the {{JarArchiveEntry}} that
> is created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}}
> contains platform specific path separators, i.e. '\'. The integration test
> requires that all path separators are '/'.
> According to
> http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
> path separators should be '/' and nothing else. So the fix is to transform
> the path separators of the included file before its name is added to the
> archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1635431 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
On 30/10/2014 12:20, Rémy Maucherat wrote: > 2014-10-30 10:42 GMT+01:00 Mark Thomas : > >> Was it just the cost of the chunking that triggered this change or was >> it something else? If it was performance, how much difference does this >> change make? >> > > Debugging something else, this turned out to not cause a failure, it was > the reversed header order that caused the problem. OK. Order can be significant for multiple instances of the same header so it makes sense to ensure that order is retained. >> Looking at the code, I can see a couple of places where this changes >> behaviour: >> - If the client requests the connection is closed >> > > Yes, that was this situation, the client sends a connection close. But in > that case connection close is also added to the response (right after this > code) so the behavior is consistent. > > >> - If the request is the last one before the connection is closed due to >> reaching the maximum number of keep-alive requests >> >> We have had bug reports in the past about not being able to detect a >> truncated response. I suspect the current unit tests for those miss the >> second case above which is my main concern right now. >> >> I don't think a system property is the right way to handle configuration >> of this feature (if such configuration is required). There is no reason >> it could not be a connector attribute. >> > > IMO the new attribute should also do the same thing for connection close in > the response. The default should be to not chunk if closing (as is right > now). I disagree on the default but not adding the behaviour. Users have had issues (not being able to identify a truncated response) because we haven't used chunked encoding but no user has reported an issue because we have used chunked encoding. Therefore the default should be to continue using chunked encoding with an option to disable it for those that want the marginal performance gain it brings. > Ok, so since you're complaining about every commit, No, I am not. I am complaining about you frequently breaking the unit tests when I am trying to get the code base to a point where I can tag it for the next release (i.e. the unit tests have to pass). I am also not particularly happy with commits like this one that knowingly introduce regressions for users in order to fix a perceived problem that isn't actually causing an issue for anyone. > next fix you'll scream more since the upgrade process is not correct If HTTP upgrade is broken, I'm not going to object to fixing it. If the fix breaks some unit tests then I'm likely to moan about that. > (no handling of leftover input bytes, anything included in the same packet > that the request header is lost - I would agree it's questionable > client behavior though). I've been digging through the code. I thought I recalled doing something like this for WebSocket but it was on the client side where such behaviour is expected. I agree it is questionable client behaviour but I'm guessing you've seen at least one client doing this. I can understand why they might. > This means adding code to pass around a ByteBuffer to the upgraded > processor to add as input since I see no other way :) Yum. Given the implementation of HTTP upgrade (dedicated upgrade processors, deliberately light-weight compared to the HTTP processors, none of the I/O scaffolding the HTTP processors have) I don't see an alternative way either. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-284) Add a skip parameter to deploy/redeploy/undeploy goals
[
https://issues.apache.org/jira/browse/MTOMCAT-284?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-284:
Fix Version/s: 2.3
Labels: patch (was: )
> Add a skip parameter to deploy/redeploy/undeploy goals
> --
>
> Key: MTOMCAT-284
> URL: https://issues.apache.org/jira/browse/MTOMCAT-284
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
>Affects Versions: 2.2
>Reporter: Dennis Lundberg
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-284.patch
>
>
> Our use case for this is a multi module project with one overlay module (with
> war packaging) and other war modules that use the first one as an overlay.
> {noformat}
> root
> +-- overlay-war
> +-- app1-war
> +-- app2-war
> {noformat}
> So app1-war and app2-war uses overlay-war as a war-type dependency to use it
> as an overlay.
> We want to use the tomcat-maven-plugin to deploy/redeploy/undeploy app1-war
> and app2-war to a Tomcat instance. However we do not want to
> deploy/redeploy/undeploy overlay-war.
> This could be fixed by adding a skip parameter that we could apply to the
> overlay-war configuration. There is a skip parameter already in the plugin
> for other goals like "run".
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-286) Integration test fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-286?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-286:
Fix Version/s: 2.3
Labels: patch (was: )
> Integration test fails on Windows
> -
>
> Key: MTOMCAT-286
> URL: https://issues.apache.org/jira/browse/MTOMCAT-286
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-286.patch
>
>
> The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail
> on Windows. The reason for the failure is that the {{JarArchiveEntry}} that
> is created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}}
> contains platform specific path separators, i.e. '\'. The integration test
> requires that all path separators are '/'.
> According to
> http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
> path separators should be '/' and nothing else. So the fix is to transform
> the path separators of the included file before its name is added to the
> archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-280) Allow running deploy-only and redeploy-only goals without pom file
[
https://issues.apache.org/jira/browse/MTOMCAT-280?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-280:
Attachment: MTOMCAT-280.patch
Here is a proposed patch that adds the ability to specify the war file as a
command line parameter: {{maven.tomcat.warFile}}
Would this solve your problem?
> Allow running deploy-only and redeploy-only goals without pom file
> --
>
> Key: MTOMCAT-280
> URL: https://issues.apache.org/jira/browse/MTOMCAT-280
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
> Components: tomcat7
>Reporter: Lauri Lehtinen
>Assignee: Olivier Lamy (*$^¨%`£)
> Attachments: MTOMCAT-280.patch
>
>
> Use case is as follows:
> 0. A 2-step CI build exists for the sole purpose of deploying any artifact to
> a remote tomcat server
> 1. Run mvn dependency:get -D... -D... to download a war file from Nexus.
> 2. Run mvn tomcat7:deploy -D... -D... to deploy the war file.
> I would prefer to not involve a pom file in this. However, if the plugin
> doesn't find one, it fail.s
> Also, it appears that all the properties I need, except warFile, can be
> overriden with -D's. The only way I'm able to make this work is create a
> dummy pom file with tomcat7 plugin defined in the build section, and a
> ${warFile} in its configuration section.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-277) ailed to execute goal org.apache.hadoop:hadoop-maven-plugins:2.4.1:protoc (compile-protoc) on project hadoop-common: org.apache.maven.plugin.MojoExecutionException: pr
[ https://issues.apache.org/jira/browse/MTOMCAT-277?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190159#comment-14190159 ] Dennis Lundberg commented on MTOMCAT-277: - How is this related to tomcat-maven-plugin? > ailed to execute goal org.apache.hadoop:hadoop-maven-plugins:2.4.1:protoc > (compile-protoc) on project hadoop-common: > org.apache.maven.plugin.MojoExecutionException: protoc failure > > > Key: MTOMCAT-277 > URL: https://issues.apache.org/jira/browse/MTOMCAT-277 > Project: Apache Tomcat Maven Plugin > Issue Type: Question >Reporter: Annies V Jose > > I was trying to install hadoop > mvn package -DskipTests -Dtar -Pdist,native > when i executed instruction > i got error > Failed to execute goal org.apache.hadoop:hadoop-maven-plugins:2.4.1:protoc > (compile-protoc) on project hadoop-common: > org.apache.maven.plugin.MojoExecutionException: protoc failure > my installed protoc version is 2.5.0 -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-280) Allow running deploy-only and redeploy-only goals without pom file
[
https://issues.apache.org/jira/browse/MTOMCAT-280?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-280:
Labels: patch (was: )
> Allow running deploy-only and redeploy-only goals without pom file
> --
>
> Key: MTOMCAT-280
> URL: https://issues.apache.org/jira/browse/MTOMCAT-280
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
> Components: tomcat7
>Reporter: Lauri Lehtinen
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Attachments: MTOMCAT-280.patch
>
>
> Use case is as follows:
> 0. A 2-step CI build exists for the sole purpose of deploying any artifact to
> a remote tomcat server
> 1. Run mvn dependency:get -D... -D... to download a war file from Nexus.
> 2. Run mvn tomcat7:deploy -D... -D... to deploy the war file.
> I would prefer to not involve a pom file in this. However, if the plugin
> doesn't find one, it fail.s
> Also, it appears that all the properties I need, except warFile, can be
> overriden with -D's. The only way I'm able to make this work is create a
> dummy pom file with tomcat7 plugin defined in the build section, and a
> ${warFile} in its configuration section.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-265) tomcatConfigurationFilesDirectory is not implemented
[ https://issues.apache.org/jira/browse/MTOMCAT-265?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190175#comment-14190175 ] Dennis Lundberg commented on MTOMCAT-265: - The cloned issue has been resolved as fixed. What is this issue about? > tomcatConfigurationFilesDirectory is not implemented > > > Key: MTOMCAT-265 > URL: https://issues.apache.org/jira/browse/MTOMCAT-265 > Project: Apache Tomcat Maven Plugin > Issue Type: Task > Components: tomcat7 >Affects Versions: 2.0-beta-1 >Reporter: Robin Böhm >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 3.0 > > Attachments: patch.diff > > > Hey Ya :) > the property "tomcatConfigurationFilesDirectory" is not implemented yet. > There is just a field declaration without any handling. > Ive written a quick patch for my own project that i assign on this issue. > Maybe someone can take this as base for the implementation... -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-262) tomcatConfigurationFilesDirectory not honoured
[ https://issues.apache.org/jira/browse/MTOMCAT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190181#comment-14190181 ] Dennis Lundberg commented on MTOMCAT-262: - Checks for this was added in an integration test in [r1382739|http://svn.apache.org/viewvc?view=revision&revision=1382739] Is this still a problem in version 2.2? > tomcatConfigurationFilesDirectory not honoured > -- > > Key: MTOMCAT-262 > URL: https://issues.apache.org/jira/browse/MTOMCAT-262 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.0 >Reporter: jieryn >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > > http://tomcat.apache.org/maven-plugin-2.0/tomcat7-maven-plugin/exec-war-mojo.html > http://rmannibucau.wordpress.com/2014/03/11/executable-jar-with-tomee-and-tomcat-maven-plugin/ > We are forced to pass -Dsystem=properties to the executable war because > :exec-war and :exec-war-only do not include additional files found in > tomcatConfigurationFilesDirectory. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-262) tomcatConfigurationFilesDirectory not honoured
[ https://issues.apache.org/jira/browse/MTOMCAT-262?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190184#comment-14190184 ] jieryn commented on MTOMCAT-262: Thanks for adding those tests. I actually migrated to Apache TomEE, and I am no longer in a position to validate this on a recent tomcat-m-p; sorry. > tomcatConfigurationFilesDirectory not honoured > -- > > Key: MTOMCAT-262 > URL: https://issues.apache.org/jira/browse/MTOMCAT-262 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.0 >Reporter: jieryn >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > > http://tomcat.apache.org/maven-plugin-2.0/tomcat7-maven-plugin/exec-war-mojo.html > http://rmannibucau.wordpress.com/2014/03/11/executable-jar-with-tomee-and-tomcat-maven-plugin/ > We are forced to pass -Dsystem=properties to the executable war because > :exec-war and :exec-war-only do not include additional files found in > tomcatConfigurationFilesDirectory. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-260) Bad default value for maven.tomcat.path
[
https://issues.apache.org/jira/browse/MTOMCAT-260?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190186#comment-14190186
]
Dennis Lundberg commented on MTOMCAT-260:
-
The class {{AbstractExecWarMojo}} overrides the parameter path from its parent
{{AbstractTomcat7Mojo}}, but gives it a different defaultValue. The Javadocs
are also a bit different. If the behavior of the parameter is supposed to be
the same, then just remove the parameter from {{AbstractExecWarMojo}} an let it
use the inherited on.
> Bad default value for maven.tomcat.path
> ---
>
> Key: MTOMCAT-260
> URL: https://issues.apache.org/jira/browse/MTOMCAT-260
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
>Affects Versions: 2.2
>Reporter: Stephen Buergler
>Priority: Minor
>
> I'm getting:
> WARNING: A context path must either be an empty string or start with a '/'.
> The path [test] does not meet these criteria and has been changed to [/test]
> http://tomcat.apache.org/maven-plugin-2.2/tomcat7-maven-plugin/exec-war-only-mojo.html
> Maybe the default for maven.tomcat.path should be '/${project.artifactId}'
> instead of '${project.artifactId}'
> Also, why not use '/' ? Maybe the description could elaborate on that more?
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Resolved] (MTOMCAT-211) The .war file is not extracted from executable war
[ https://issues.apache.org/jira/browse/MTOMCAT-211?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg resolved MTOMCAT-211. - Resolution: Fixed Fix Version/s: (was: 3.0) 2.3 > The .war file is not extracted from executable war > -- > > Key: MTOMCAT-211 > URL: https://issues.apache.org/jira/browse/MTOMCAT-211 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.2 > Environment: Windows 7 64bit, Oracle JDK-1.7.0.11, Maven-2.2 >Reporter: Petr Novak >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.3 > > Attachments: maven-tomcat-test-0.0.1-SNAPSHOT-war-exec.jar, > maven-tomcat-test.zip > > > I create simple web-app project, build it by mvn clean package. > Than I try to execute the created JAR, but the following exception was thrown: > java -jar maven-tomcat-test-0.0.1-SNAPSHOT-war-exec.jar > Exception in thread "main" java.io.FileNotFoundException: > .extract\webapps\ctx\test.war (The system cannot find the path specified) > at java.io.FileOutputStream.open(Native Method) > at java.io.FileOutputStream.(FileOutputStream.java:212) > at java.io.FileOutputStream.(FileOutputStream.java:165) > at > org.apache.tomcat.maven.runner.Tomcat7Runner.expand(Tomcat7Runner.java:680) > at > org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:555) > at > org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:200) > at > org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:204) > When I look at ".extract\webapps\ctx\" , the folder is empty. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635524 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ test/org/apache/coyote/http11/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Thu Oct 30 15:45:21 2014
New Revision: 1635524
URL: http://svn.apache.org/r1635524
Log:
Make the disabling of chunked encoding on connection close optional and disable
by default since automatically disabling it causes a regression (see this
discussion http://tomcat.markmail.org/thread/zvrrtvwme6liefng for the details).
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1635524&r1=1635523&r2=1635524&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Oct 30 15:45:21 2014
@@ -1478,7 +1478,8 @@ public abstract class AbstractHttp11Proc
// HTTP 1.1 and we are using keep-alive then we chunk unless we
have
// a Connection: close header
connectionClosePresent = isConnectionClose(headers);
-if (entityBody && http11 && keepAlive && !connectionClosePresent) {
+if (entityBody && http11 && (keepAlive ||
!endpoint.getDisableChunkingOnClose()) &&
+!connectionClosePresent) {
getOutputBuffer().addActiveFilter
(outputFilters[Constants.CHUNKED_FILTER]);
contentDelimitation = true;
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1635524&r1=1635523&r2=1635524&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Oct 30 15:45:21 2014
@@ -207,6 +207,13 @@ public abstract class AbstractHttp11Prot
endpoint.setMaxKeepAliveRequests(mkar);
}
+public boolean getDisableChunkingOnClose() {
+return endpoint.getDisableChunkingOnClose();
+}
+public void setDisableChunkingOnClose(boolean disableChunkingOnClose) {
+endpoint.setDisableChunkingOnClose(disableChunkingOnClose);
+}
+
protected NpnHandler npnHandler;
@SuppressWarnings("unchecked")
public void setNpnHandler(String impl) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1635524&r1=1635523&r2=1635524&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Oct
30 15:45:21 2014
@@ -45,6 +45,7 @@ import org.apache.tomcat.util.threads.Th
*
* @author Mladen Turk
* @author Remy Maucherat
+ * @param The type of socket the endpoint is associated with.
*/
public abstract class AbstractEndpoint {
@@ -423,6 +424,21 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1635524&r1=1635523&r2=1635524&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
Thu Oct 30 15:45:21 2014
@@ -55,6 +55,16 @@ public class TestAbstractHttp11Processor
@Test
public void testResponseWithErrorChunked() throws Exception {
+doTestResponseWithErrorChunked(false);
+}
+
+@Test
+public void testResponseWithErrorChunkedDisabled() throws Exception {
+doTestResponseWithErrorChunked(true);
+}
+
+
+private void doTestResponseWithErrorChunked(boolean disabled) throws
Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -65,6 +75,14 @@ public class TestAbstractHttp11Processor
new ResponseWithErrorServlet(true));
ctx.addServletMapping("/*", "ChunkedResponseWithErrorServlet");
+// This setting means the connection will be closed at the end of the
+// request
+tomcat.getConnector().setAttribute("maxKeepAliveRequests", "1");
+
+if (disabled
[jira] [Commented] (MTOMCAT-284) Add a skip parameter to deploy/redeploy/undeploy goals
[
https://issues.apache.org/jira/browse/MTOMCAT-284?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190279#comment-14190279
]
Dennis Lundberg commented on MTOMCAT-284:
-
This has apparently already been fixed for tomcat7-maven-plugin, but not for
tomcat6-maven-plugin.
> Add a skip parameter to deploy/redeploy/undeploy goals
> --
>
> Key: MTOMCAT-284
> URL: https://issues.apache.org/jira/browse/MTOMCAT-284
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
>Affects Versions: 2.2
>Reporter: Dennis Lundberg
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-284.patch
>
>
> Our use case for this is a multi module project with one overlay module (with
> war packaging) and other war modules that use the first one as an overlay.
> {noformat}
> root
> +-- overlay-war
> +-- app1-war
> +-- app2-war
> {noformat}
> So app1-war and app2-war uses overlay-war as a war-type dependency to use it
> as an overlay.
> We want to use the tomcat-maven-plugin to deploy/redeploy/undeploy app1-war
> and app2-war to a Tomcat instance. However we do not want to
> deploy/redeploy/undeploy overlay-war.
> This could be fixed by adding a skip parameter that we could apply to the
> overlay-war configuration. There is a skip parameter already in the plugin
> for other goals like "run".
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-225) Documented deployment url returns 403 error
[ https://issues.apache.org/jira/browse/MTOMCAT-225?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190284#comment-14190284 ] Dennis Lundberg commented on MTOMCAT-225: - The text appears in two places: - The usage page for tomcat7-maven-plugin http://tomcat.apache.org/maven-plugin-2.0/tomcat7-maven-plugin/usage.html - The Mojo pages, for example http://tomcat.apache.org/maven-plugin-2.0/tomcat7-maven-plugin/deploy-mojo.html#url Both was fixed in version 2.1. > Documented deployment url returns 403 error > --- > > Key: MTOMCAT-225 > URL: https://issues.apache.org/jira/browse/MTOMCAT-225 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.0, 2.1 > Environment: Ubuntu 12.04, Linux 3.5.0-26-generic, AMD64, Apache > Tomcat/7.0.30, JVM 1.7.0_21-b02 >Reporter: Joseph Lust >Assignee: Olivier Lamy (*$^¨%`£) > Labels: code, docs > Fix For: 2.1 > > > Following the documentation for deployment does not work and is consternating. > According to the docs, the default values of > "http://localhost:8080/manager/html"; should be used with tomcat7:deploy and > tomcat7:deploy-only. However, this will consistently return 403. > Using http://localhost:8080/manager/text however works fine. Testing with > /jmxproxy, /status, and /html do not however succeed, even if all manager > permissions are given to the credentialed user. > Please update the docs and the defaults so that deployment works as expected > out of the box. > For more details and reproducible examples, see the SO thread: > http://stackoverflow.com/questions/9940701/maven-tomcat7deploy-fails-with-access-denied > -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-225) Documented deployment url returns 403 error
[ https://issues.apache.org/jira/browse/MTOMCAT-225?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Dennis Lundberg closed MTOMCAT-225. --- Resolution: Fixed Fix Version/s: (was: moreinfo) 2.1 > Documented deployment url returns 403 error > --- > > Key: MTOMCAT-225 > URL: https://issues.apache.org/jira/browse/MTOMCAT-225 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.0, 2.1 > Environment: Ubuntu 12.04, Linux 3.5.0-26-generic, AMD64, Apache > Tomcat/7.0.30, JVM 1.7.0_21-b02 >Reporter: Joseph Lust >Assignee: Olivier Lamy (*$^¨%`£) > Labels: code, docs > Fix For: 2.1 > > > Following the documentation for deployment does not work and is consternating. > According to the docs, the default values of > "http://localhost:8080/manager/html"; should be used with tomcat7:deploy and > tomcat7:deploy-only. However, this will consistently return 403. > Using http://localhost:8080/manager/text however works fine. Testing with > /jmxproxy, /status, and /html do not however succeed, even if all manager > permissions are given to the credentialed user. > Please update the docs and the defaults so that deployment works as expected > out of the box. > For more details and reproducible examples, see the SO thread: > http://stackoverflow.com/questions/9940701/maven-tomcat7deploy-fails-with-access-denied > -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-112) file path inside ${basedir}/src/main/tomcatconf is not preserved
[
https://issues.apache.org/jira/browse/MTOMCAT-112?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14190295#comment-14190295
]
Dennis Lundberg commented on MTOMCAT-112:
-
There is an IT for this in tomcat7-maven-plugin, that checks that such paths
are preserved.
By the way, this parameter is only available in tomcat7-mavne-plugin as far as
I can tell.
> file path inside ${basedir}/src/main/tomcatconf is not preserved
>
>
> Key: MTOMCAT-112
> URL: https://issues.apache.org/jira/browse/MTOMCAT-112
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat6
>Affects Versions: 2.0-beta-1
> Environment: $ uname --all
> Linux 3.0.0-14-generic-pae #23-Ubuntu SMP Mon Nov 21 22:07:10 UTC 2011 i686
> i686 i386 GNU/Linux
> $ mvn -version
> Apache Maven 3.0.3 (r1075438; 2011-02-28 14:31:09-0300)
> Maven home: /home/veronez/install/java/apache-maven-3.0.3
> Java version: 1.6.0_23, vendor: Sun Microsystems Inc.
> Java home: /usr/lib/jvm/java-6-openjdk/jre
> Default locale: en_US, platform encoding: UTF-8
> OS name: "linux", version: "3.0.0-14-generic-pae", arch: "i386", family:
> "unix"
>Reporter: Fabio Cechinel Veronez
>Assignee: Olivier Lamy (*$^¨%`£)
>
> Hello
> I have created a file under ${basedir}/src/main/tomcatconf using the folder
> structure /Catalina/localhost/context#subcontext.xml
> I expected to have this files copied to
> /target/tomcat/conf/Catalina/localhost/context#subcontext.xml but instead it
> is copied to /target/tomcat/conf/context#subcontext.xml.
> My intention is to create subcontext to map resources to an folder located
> outside of my application. As explained at
> http://harkiran-howtos.blogspot.com/2009/08/map-external-directory-into-your.html.
> Ps.: I'm not sure if it is a bug or expected behavior, i would sent this
> question to a mail list but i couldn't find it... sorry if i miss posted it
> here.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-284) Add a skip parameter to deploy/redeploy/undeploy goals
[
https://issues.apache.org/jira/browse/MTOMCAT-284?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-284:
Attachment: MTOMCAT-284-2.patch
New patch that only touches tomcat6-maven-plugin, since tomcat7-maven-plugin
was already fixed by MTOMCAT-267.
> Add a skip parameter to deploy/redeploy/undeploy goals
> --
>
> Key: MTOMCAT-284
> URL: https://issues.apache.org/jira/browse/MTOMCAT-284
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
>Affects Versions: 2.2
>Reporter: Dennis Lundberg
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-284-2.patch
>
>
> Our use case for this is a multi module project with one overlay module (with
> war packaging) and other war modules that use the first one as an overlay.
> {noformat}
> root
> +-- overlay-war
> +-- app1-war
> +-- app2-war
> {noformat}
> So app1-war and app2-war uses overlay-war as a war-type dependency to use it
> as an overlay.
> We want to use the tomcat-maven-plugin to deploy/redeploy/undeploy app1-war
> and app2-war to a Tomcat instance. However we do not want to
> deploy/redeploy/undeploy overlay-war.
> This could be fixed by adding a skip parameter that we could apply to the
> overlay-war configuration. There is a skip parameter already in the plugin
> for other goals like "run".
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-284) Add a skip parameter to deploy/redeploy/undeploy goals
[
https://issues.apache.org/jira/browse/MTOMCAT-284?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Dennis Lundberg updated MTOMCAT-284:
Attachment: (was: MTOMCAT-284.patch)
> Add a skip parameter to deploy/redeploy/undeploy goals
> --
>
> Key: MTOMCAT-284
> URL: https://issues.apache.org/jira/browse/MTOMCAT-284
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
>Affects Versions: 2.2
>Reporter: Dennis Lundberg
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-284-2.patch
>
>
> Our use case for this is a multi module project with one overlay module (with
> war packaging) and other war modules that use the first one as an overlay.
> {noformat}
> root
> +-- overlay-war
> +-- app1-war
> +-- app2-war
> {noformat}
> So app1-war and app2-war uses overlay-war as a war-type dependency to use it
> as an overlay.
> We want to use the tomcat-maven-plugin to deploy/redeploy/undeploy app1-war
> and app2-war to a Tomcat instance. However we do not want to
> deploy/redeploy/undeploy overlay-war.
> This could be fixed by adding a skip parameter that we could apply to the
> overlay-war configuration. There is a skip parameter already in the plugin
> for other goals like "run".
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 7.0.57
Hi, I want to start preparing Tomcat 7.0.57. If you would like to add something to this release please reply here. Regards, Violeta
Re: svn commit: r1635524 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ test/org/apache/coyote/http11/ webapps/docs/ webapps/docs/config/
2014-10-30 16:45 GMT+01:00 : > Author: markt > Date: Thu Oct 30 15:45:21 2014 > New Revision: 1635524 > > URL: http://svn.apache.org/r1635524 > Log: > Make the disabling of chunked encoding on connection close optional and > disable by default since automatically disabling it causes a regression > (see this discussion http://tomcat.markmail.org/thread/zvrrtvwme6liefng > for the details). > > There should be no difference with the !connectionClosePresent as one of the flags is for connection: close in the request, the other one for connection: close in the response. And connection: close is added to the response if keepAlive is false. So this doesn't make sense. Rémy
Re: svn commit: r1635524 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ test/org/apache/coyote/http11/ webapps/docs/ webapps/docs/config/
On 30/10/2014 18:57, Rémy Maucherat wrote: > 2014-10-30 16:45 GMT+01:00 : > >> Author: markt >> Date: Thu Oct 30 15:45:21 2014 >> New Revision: 1635524 >> >> URL: http://svn.apache.org/r1635524 >> Log: >> Make the disabling of chunked encoding on connection close optional and >> disable by default since automatically disabling it causes a regression >> (see this discussion http://tomcat.markmail.org/thread/zvrrtvwme6liefng >> for the details). >> > There should be no difference with the !connectionClosePresent as one of > the flags is for connection: close in the request, the other one for > connection: close in the response. And connection: close is added to the > response if keepAlive is false. > > So this doesn't make sense. What doesn't make sense? Would it be clearer if the option was called "disableChunkingIfNoKeepAlive" and the description was updated accordingly? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1635524 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ test/org/apache/coyote/http11/ webapps/docs/ webapps/docs/config/
2014-10-30 21:18 GMT+01:00 Mark Thomas : > > There should be no difference with the !connectionClosePresent as one of > > the flags is for connection: close in the request, the other one for > > connection: close in the response. And connection: close is added to the > > response if keepAlive is false. > > > > So this doesn't make sense. > > What doesn't make sense? > The connectionClosePresent flag was added, which disables chunking. It's the same thing as keepalive. > > Would it be clearer if the option was called > "disableChunkingIfNoKeepAlive" and the description was updated accordingly? > > I don't care about this option, please forget about it and let me revert the whole thing. Let's move on. Rémy
svn commit: r1635634 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Thu Oct 30 22:55:31 2014
New Revision: 1635634
URL: http://svn.apache.org/r1635634
Log:
[MTOMCAT-286] Integration test fails on Windows
Submitted by Dennis Lundberg
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=1635634&r1=1635633&r2=1635634&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 Oct 30 22:55:31 2014
@@ -565,7 +565,8 @@ public abstract class AbstractExecWarMoj
{
sourceFileInputStream = new FileInputStream( inputFile );
-archiveOutputStream.putArchiveEntry( new JarArchiveEntry(
destinationPath + includeFileName ) );
+// MTOMCAT-286 Need to replace \ with / in includeFileName
+archiveOutputStream.putArchiveEntry( new JarArchiveEntry(
destinationPath + StringUtils.replace( includeFileName, "\\", "/" ) ) );
IOUtils.copy( sourceFileInputStream, archiveOutputStream );
archiveOutputStream.closeArchiveEntry();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635635 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Thu Oct 30 22:55:40 2014
New Revision: 1635635
URL: http://svn.apache.org/r1635635
Log:
format
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=1635635&r1=1635634&r2=1635635&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 Oct 30 22:55:40 2014
@@ -565,8 +565,9 @@ public abstract class AbstractExecWarMoj
{
sourceFileInputStream = new FileInputStream( inputFile );
-// MTOMCAT-286 Need to replace \ with / in includeFileName
-archiveOutputStream.putArchiveEntry( new JarArchiveEntry(
destinationPath + StringUtils.replace( includeFileName, "\\", "/" ) ) );
+// MTOMCAT-286 Need to replace \ with / in includeFileName
+archiveOutputStream.putArchiveEntry(
+new JarArchiveEntry( destinationPath +
StringUtils.replace( includeFileName, "\\", "/" ) ) );
IOUtils.copy( sourceFileInputStream, archiveOutputStream );
archiveOutputStream.closeArchiveEntry();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-286) Integration test fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-286?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) closed MTOMCAT-286.
--
Resolution: Fixed
applied
Thanks!
> Integration test fails on Windows
> -
>
> Key: MTOMCAT-286
> URL: https://issues.apache.org/jira/browse/MTOMCAT-286
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-286.patch
>
>
> The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail
> on Windows. The reason for the failure is that the {{JarArchiveEntry}} that
> is created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}}
> contains platform specific path separators, i.e. '\'. The integration test
> requires that all path separators are '/'.
> According to
> http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
> path separators should be '/' and nothing else. So the fix is to transform
> the path separators of the included file before its name is added to the
> archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-286) Integration test fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-286?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14191002#comment-14191002
]
Hudson commented on MTOMCAT-286:
SUCCESS: Integrated in TomcatMavenPlugin-mvn3.x #286 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/286/])
[MTOMCAT-286] Integration test fails on Windows
Submitted by Dennis Lundberg (olamy:
http://svn.apache.org/viewvc/?view=rev&rev=1635634)
*
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
> Integration test fails on Windows
> -
>
> Key: MTOMCAT-286
> URL: https://issues.apache.org/jira/browse/MTOMCAT-286
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-286.patch
>
>
> The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail
> on Windows. The reason for the failure is that the {{JarArchiveEntry}} that
> is created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}}
> contains platform specific path separators, i.e. '\'. The integration test
> requires that all path separators are '/'.
> According to
> http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
> path separators should be '/' and nothing else. So the fix is to transform
> the path separators of the included file before its name is added to the
> archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-286) Integration test fails on Windows
[
https://issues.apache.org/jira/browse/MTOMCAT-286?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14191010#comment-14191010
]
Hudson commented on MTOMCAT-286:
FAILURE: Integrated in TomcatMavenPlugin-mvn3.x-windows #2 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/2/])
[MTOMCAT-286] Integration test fails on Windows
Submitted by Dennis Lundberg (olamy:
http://svn.apache.org/viewvc/?view=rev&rev=1635634)
*
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
> Integration test fails on Windows
> -
>
> Key: MTOMCAT-286
> URL: https://issues.apache.org/jira/browse/MTOMCAT-286
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.2
> Environment: Windows 7
>Reporter: Dennis Lundberg
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-286.patch
>
>
> The integration test "simple-war-exec-project" in tomcat7-maven-plugin fail
> on Windows. The reason for the failure is that the {{JarArchiveEntry}} that
> is created in {{AbstractExecWarMojo.copyDirectoryContentIntoArchive()}}
> contains platform specific path separators, i.e. '\'. The integration test
> requires that all path separators are '/'.
> According to
> http://docs.oracle.com/javase/7/docs/api/java/util/zip/ZipEntry.html#isDirectory%28%29
> path separators should be '/' and nothing else. So the fix is to transform
> the path separators of the included file before its name is added to the
> archive.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-280) Allow running deploy-only and redeploy-only goals without pom file
[
https://issues.apache.org/jira/browse/MTOMCAT-280?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) closed MTOMCAT-280.
--
Resolution: Fixed
Fix Version/s: 2.3
patch applied.
Thanks!
> Allow running deploy-only and redeploy-only goals without pom file
> --
>
> Key: MTOMCAT-280
> URL: https://issues.apache.org/jira/browse/MTOMCAT-280
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
> Components: tomcat7
>Reporter: Lauri Lehtinen
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-280.patch
>
>
> Use case is as follows:
> 0. A 2-step CI build exists for the sole purpose of deploying any artifact to
> a remote tomcat server
> 1. Run mvn dependency:get -D... -D... to download a war file from Nexus.
> 2. Run mvn tomcat7:deploy -D... -D... to deploy the war file.
> I would prefer to not involve a pom file in this. However, if the plugin
> doesn't find one, it fail.s
> Also, it appears that all the properties I need, except warFile, can be
> overriden with -D's. The only way I'm able to make this work is create a
> dummy pom file with tomcat7 plugin defined in the build section, and a
> ${warFile} in its configuration section.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1635637 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomca
Author: olamy
Date: Thu Oct 30 23:16:55 2014
New Revision: 1635637
URL: http://svn.apache.org/r1635637
Log:
[MTOMCAT-280] Allow running deploy-only and redeploy-only goals without pom file
Submitted by Dennis Lundberg
Modified:
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/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=1635637&r1=1635636&r2=1635637&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
Thu Oct 30 23:16:55 2014
@@ -41,7 +41,7 @@ public class AbstractDeployWarMojo
/**
* The path of the WAR file to deploy.
*/
-@Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}.war", required = true )
+@Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}.war", property =
"maven.tomcat.warFile", required = true )
private File warFile;
// --
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=1635637&r1=1635636&r2=1635637&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
Thu Oct 30 23:16:55 2014
@@ -41,7 +41,7 @@ public class AbstractDeployWarMojo
/**
* The path of the WAR file to deploy.
*/
-@Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}.war", required = true )
+@Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}.war", property =
"maven.tomcat.warFile", required = true )
private File warFile;
// --
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-280) Allow running deploy-only and redeploy-only goals without pom file
[
https://issues.apache.org/jira/browse/MTOMCAT-280?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14191025#comment-14191025
]
Hudson commented on MTOMCAT-280:
FAILURE: Integrated in TomcatMavenPlugin-mvn3.x-windows #3 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x-windows/3/])
[MTOMCAT-280] Allow running deploy-only and redeploy-only goals without pom file
Submitted by Dennis Lundberg (olamy:
http://svn.apache.org/viewvc/?view=rev&rev=1635637)
*
/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
> Allow running deploy-only and redeploy-only goals without pom file
> --
>
> Key: MTOMCAT-280
> URL: https://issues.apache.org/jira/browse/MTOMCAT-280
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
> Components: tomcat7
>Reporter: Lauri Lehtinen
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-280.patch
>
>
> Use case is as follows:
> 0. A 2-step CI build exists for the sole purpose of deploying any artifact to
> a remote tomcat server
> 1. Run mvn dependency:get -D... -D... to download a war file from Nexus.
> 2. Run mvn tomcat7:deploy -D... -D... to deploy the war file.
> I would prefer to not involve a pom file in this. However, if the plugin
> doesn't find one, it fail.s
> Also, it appears that all the properties I need, except warFile, can be
> overriden with -D's. The only way I'm able to make this work is create a
> dummy pom file with tomcat7 plugin defined in the build section, and a
> ${warFile} in its configuration section.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-211) The .war file is not extracted from executable war
[ https://issues.apache.org/jira/browse/MTOMCAT-211?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-211. -- > The .war file is not extracted from executable war > -- > > Key: MTOMCAT-211 > URL: https://issues.apache.org/jira/browse/MTOMCAT-211 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat7 >Affects Versions: 2.2 > Environment: Windows 7 64bit, Oracle JDK-1.7.0.11, Maven-2.2 >Reporter: Petr Novak >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.3 > > Attachments: maven-tomcat-test-0.0.1-SNAPSHOT-war-exec.jar, > maven-tomcat-test.zip > > > I create simple web-app project, build it by mvn clean package. > Than I try to execute the created JAR, but the following exception was thrown: > java -jar maven-tomcat-test-0.0.1-SNAPSHOT-war-exec.jar > Exception in thread "main" java.io.FileNotFoundException: > .extract\webapps\ctx\test.war (The system cannot find the path specified) > at java.io.FileOutputStream.open(Native Method) > at java.io.FileOutputStream.(FileOutputStream.java:212) > at java.io.FileOutputStream.(FileOutputStream.java:165) > at > org.apache.tomcat.maven.runner.Tomcat7Runner.expand(Tomcat7Runner.java:680) > at > org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:555) > at > org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:200) > at > org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:204) > When I look at ".extract\webapps\ctx\" , the folder is empty. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-280) Allow running deploy-only and redeploy-only goals without pom file
[
https://issues.apache.org/jira/browse/MTOMCAT-280?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14191032#comment-14191032
]
Hudson commented on MTOMCAT-280:
SUCCESS: Integrated in TomcatMavenPlugin-mvn3.x #287 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/287/])
[MTOMCAT-280] Allow running deploy-only and redeploy-only goals without pom file
Submitted by Dennis Lundberg (olamy:
http://svn.apache.org/viewvc/?view=rev&rev=1635637)
*
/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
> Allow running deploy-only and redeploy-only goals without pom file
> --
>
> Key: MTOMCAT-280
> URL: https://issues.apache.org/jira/browse/MTOMCAT-280
> Project: Apache Tomcat Maven Plugin
> Issue Type: Improvement
> Components: tomcat7
>Reporter: Lauri Lehtinen
>Assignee: Olivier Lamy (*$^¨%`£)
> Labels: patch
> Fix For: 2.3
>
> Attachments: MTOMCAT-280.patch
>
>
> Use case is as follows:
> 0. A 2-step CI build exists for the sole purpose of deploying any artifact to
> a remote tomcat server
> 1. Run mvn dependency:get -D... -D... to download a war file from Nexus.
> 2. Run mvn tomcat7:deploy -D... -D... to deploy the war file.
> I would prefer to not involve a pom file in this. However, if the plugin
> doesn't find one, it fail.s
> Also, it appears that all the properties I need, except warFile, can be
> overriden with -D's. The only way I'm able to make this work is create a
> dummy pom file with tomcat7 plugin defined in the build section, and a
> ${warFile} in its configuration section.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-277) ailed to execute goal org.apache.hadoop:hadoop-maven-plugins:2.4.1:protoc (compile-protoc) on project hadoop-common: org.apache.maven.plugin.MojoExecutionException: proto
[ https://issues.apache.org/jira/browse/MTOMCAT-277?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-277. -- Resolution: Not a Problem Assignee: Olivier Lamy (*$^¨%`£) > ailed to execute goal org.apache.hadoop:hadoop-maven-plugins:2.4.1:protoc > (compile-protoc) on project hadoop-common: > org.apache.maven.plugin.MojoExecutionException: protoc failure > > > Key: MTOMCAT-277 > URL: https://issues.apache.org/jira/browse/MTOMCAT-277 > Project: Apache Tomcat Maven Plugin > Issue Type: Question >Reporter: Annies V Jose >Assignee: Olivier Lamy (*$^¨%`£) > > I was trying to install hadoop > mvn package -DskipTests -Dtar -Pdist,native > when i executed instruction > i got error > Failed to execute goal org.apache.hadoop:hadoop-maven-plugins:2.4.1:protoc > (compile-protoc) on project hadoop-common: > org.apache.maven.plugin.MojoExecutionException: protoc failure > my installed protoc version is 2.5.0 -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 26 mins 3 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141031-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141031/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141031.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141031-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141031/bin/openssl -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141031.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomca
