[GUMP@vmgump]: Project tomcat-trunk-validate (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-validate 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-validate : 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-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 31 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140729.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140729.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140729.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140729.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-18.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar setproxy: downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.8-SNAPSHOT on 2905 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:132: Line matches the illegal pattern '\s+$'. [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/changelog.xml:141: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:539: Got 2 errors and 0 warnings. Total time: 31 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20140729060005, vmgump.apache.org:vmgump:20140729060005 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56784] New: Possible atomicity violations
https://issues.apache.org/bugzilla/show_bug.cgi?id=56784
Bug ID: 56784
Summary: Possible atomicity violations
Product: Tomcat 6
Version: 6.0.41
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: diogogso...@gmail.com
I'm developing a tool for atomicity violation detection and I think it have
found a few atomicity violations in catalina. These are issues are due to
non-atomic compositions of calls to a certain object.
In org.apache.catalina.core.ContainerBase, method getChildren(), lines
1526-1534:
public ObjectName[] getChildren() {
1526: ObjectName result[]=new ObjectName[children.size()];
Iterator it=children.values().iterator();
int i=0;
while( it.hasNext() ) {
Object next=it.next();
if( next instanceof ContainerBase ) {
1531:result[i++]=((ContainerBase)next).getJmxName();
}
}
return result;
}
Here result is alloced with size children.size(). A concurrent thread may
add more objects to children possibly causing an invalid access to array
result in line 1531.
__
In org.apache.catalina.core.StandardEngine, method start(), lines 438-439:
public void start() throws LifecycleException {
...
438:if( mserver.isRegistered(realmName ) ) {
439:mserver.invoke(realmName, init,
new Object[] {},
new String[] {}
);
}
...
}
Can the init method be unregistered between lines 438 and 439?
__
In org.apache.catalina.core.StandardContext, method addParameter(), lines
2659-2672:
public void addParameter(String name, String value) {
...
2664: if (parameters.get(name) != null)
throw new IllegalArgumentException
(sm.getString(standardContext.parameter.duplicate, name));
// Add this parameter to our defined set
synchronized (parameters) {
2670: parameters.put(name, value);
}
fireContainerEvent(addParameter, name);
}
A concurrent thread may add the same parameter between the execution of line
2664 and 2670. In that case both threads will think they succeeded, when the
expected behavior is for one of them to receive the exception thrown in line
2665.
Thank you
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56765] Classloader leak in Tomcat 8.0.9 caused by DBCP 2.0
https://issues.apache.org/bugzilla/show_bug.cgi?id=56765 John Anderson dtgjyh...@yahoo.com changed: What|Removed |Added Hardware|PC |All OS||All --- Comment #1 from John Anderson dtgjyh...@yahoo.com --- I tried to replace tomcat-dbcp.jar in Tomcat's lib directory with the file from Tomcat 7.0.54 and it indeed fixed the leak. I only had to add factory=org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory to my context.xml. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: new log format?
Am 28.07.2014 um 09:59 schrieb Romain Manni-Bucau: 2014-07-28 9:38 GMT+02:00 Rainer Jung rainer.j...@kippdata.de: Am 27.07.2014 um 19:19 schrieb Romain Manni-Bucau: Here is the one we use: http://svn.apache.org/repos/asf/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java Can you compare the infomration provided by that formatter withz the info provided by OneLineFormatter (Example line)? By a quick look at the code, OneLineFormatter doesn't seem to show much info. OneLineFormatter: 28-Jul-2014 09:56:25.516 INFO [localhost-startStop-1] org.apache.catalina.startup.HostConfig.deployWAR Deployment of web application archive /home/prod/hazelcast-tomcat/webapps/ROOT.war has finished in 3 283 ms SimpleLineFormatter: INFO - Deployment of web application archive /home/prod/hazelcast-tomcat/webapps/ROOT.war has finished in 3 283 ms Main difference is OneLineFormatter often overflow in console (font size 9pt, screen size: 17), not SimpleLineFormatter - very nice in dev Main issue is logs are not redable with OneLineFormatter (nothing is aligned etc) which is sad since because it is the console logger it is the one used in dev. Readability is somewhat subjective. For a production use you'd typically not read a log file line by line from start to stop, but you are looking for patterns and then start to read lines around matches. But in order to be able to look for a pattern, context helps a lot. An important example is as Konstantin already mentioned the logging thread name. You can correlate with other logs and you can also untangle concurrent log events belonging to different threads/requests. I agree that's why having it in file logger is important but for console I think we can improve it (in particular since console logger is mainly the same as file logger with few less info so I consider it as a dev logger more than a prod one). OK, good thing: I myself would find it a good compromise to optimize the console handler by default on console use (dev), and the file handler on log file use (prod). That would mean they both need a different formatter (or formatter config is that is possible). Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614281 - /tomcat/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Jul 29 08:08:12 2014 New Revision: 1614281 URL: http://svn.apache.org/r1614281 Log: Fix checkstyle complaints about trailing whitespace. 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=1614281r1=1614280r2=1614281view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 29 08:08:12 2014 @@ -129,7 +129,7 @@ class loader that loaded the WebSocket implementation. This allows WebSocket client connections from within web applications to access, amongst other things, the JNDI resources associated with the web -application. (markt) +application. (markt) /fix /changelog /subsection @@ -138,7 +138,7 @@ fix Correct the label in the list of sessions by idle time for the bin that represents the idle time immediately below the maximum permitted idle -time when using the expire command of the Manager application. (markt) +time when using the expire command of the Manager application. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56785] New: NullPointer in processAnnotationsFile while Applicaiton Startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56785 Bug ID: 56785 Summary: NullPointer in processAnnotationsFile while Applicaiton Startup Product: Tomcat 8 Version: 8.0.8 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: juergen.suss...@gmail.com Hello, we go the following exception in Aplicaiton startup. java.lang.NullPointerException at org.apache.catalina.startup.ContextConfig.processAnnotationsFile(ContextConfig.java:1966) at org.apache.catalina.startup.ContextConfig.processAnnotationsFile(ContextConfig.java:1967) at org.apache.catalina.startup.ContextConfig.processAnnotationsUrl(ContextConfig.java:1920) at org.apache.catalina.startup.ContextConfig.processAnnotations(ContextConfig.java:1878) at org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1146) at org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:768) at org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:303) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:117) at org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90) at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5069) at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) ... 6 more The reason was that we added -Duser.dir=customDir to give Tomcat a uniqe working dir. Within our customDir there was a directory which was not accessible for the tomcat user. It belongs to root and no one else has access. So tomcat tries to scan the user.dir and tries to list files within the restricted dir. Doing so ths file.listFiles() command retuns null (instead of a list of files) which is not correctly handled and causing this Nullpointer and preventing the Server from startup. to recrate set -Duser.dir in setenv.sh to /tmp, create a folder /tmp/test, give permission 700 to /tmp/test, chwon root:root /tmp/test and start a tomcat with at least one application and a user other than root. The fix would be to correctly handle nullpointers or to simply write a meningfull log message. Kind regards Juergen Sussner -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614288 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/ContainerBase.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jul 29 08:59:01 2014
New Revision: 1614288
URL: http://svn.apache.org/r1614288
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56648
Don't block requests while a Context is started
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1614288r1=1614287r2=1614288view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 08:59:01 2014
@@ -68,12 +68,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, schultz
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56648
- Don't block requests while a Context is started
- http://people.apache.org/~markt/patches/2014-07-08-bug56648-tc6-v1.patch
- +1: markt, kkolinko, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56661
Support using AJP request attribute AJP_LOCAL_ADDR to fix getLocalAddr().
Backport of r1609593 from trunk resp. r1609606 from tc7.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1614288r1=1614287r2=1614288view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Tue
Jul 29 08:59:01 2014
@@ -5,9 +5,9 @@
* 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.
@@ -193,7 +193,7 @@ public abstract class ContainerBase
* Associated logger name.
*/
protected String logName = null;
-
+
/**
* The Manager implementation with which this Container is associated.
@@ -206,7 +206,7 @@ public abstract class ContainerBase
*/
protected Cluster cluster = null;
-
+
/**
* The human-readable name of this Container.
*/
@@ -293,10 +293,10 @@ public abstract class ContainerBase
/**
* Get the delay between the invocation of the backgroundProcess method on
* this container and its children. Child containers will not be invoked
- * if their delay value is not negative (which would mean they are using
- * their own thread). Setting this to a positive value will cause
- * a thread to be spawn. After waiting the specified amount of time,
- * the thread will invoke the executePeriodic method on this container
+ * if their delay value is not negative (which would mean they are using
+ * their own thread). Setting this to a positive value will cause
+ * a thread to be spawn. After waiting the specified amount of time,
+ * the thread will invoke the executePeriodic method on this container
* and all its children.
*/
public int getBackgroundProcessorDelay() {
@@ -307,8 +307,8 @@ public abstract class ContainerBase
/**
* Set the delay between the invocation of the execute method on this
* container and its children.
- *
- * @param delay The delay in seconds between the invocation of
+ *
+ * @param delay The delay in seconds between the invocation of
* backgroundProcess methods
*/
public void setBackgroundProcessorDelay(int delay) {
@@ -732,8 +732,8 @@ public abstract class ContainerBase
*/
public synchronized void setResources(DirContext resources) {
// Called from StandardContext.setResources()
-// - StandardContext.start()
-// - ContainerBase.addChildInternal()
+// - StandardContext.start()
+// - ContainerBase.addChildInternal()
// Change components if necessary
DirContext oldResources = this.resources;
@@ -791,27 +791,30 @@ public abstract class ContainerBase
' is not unique);
child.setParent(this); // May throw IAE
children.put(child.getName(), child);
+}
-// Start child
-if (started startChildren (child instanceof Lifecycle)) {
-boolean success = false;
-try {
-((Lifecycle) child).start();
-
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/285 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1614281 Blamelist: kkolinko BUILD FAILED: exception compile_1 upload_2 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56648] ContainerBase.addChild blocks all user requests while single webapp is being deployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56648 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- This has been fixed in 6.0.x for 6.0.42 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Early Access builds for JDK 9 b24, JDK 8u20 b23 are available on java.net
Hi Mladen/Mark, Early Access builds for JDK 9 b24 https://jdk9.java.net/download/ and JDK 8u20 b23 https://jdk8.java.net/download.html are available on java.net. As we enter the later phases of development for JDK 8u20 , please log any show stoppers as soon as possible. Rgds, Rory -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland
svn commit: r1614289 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Parser.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jul 29 09:16:28 2014
New Revision: 1614289
URL: http://svn.apache.org/r1614289
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56612
Correctly parse {'\'\''} in JSPs
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1614289r1=1614288r2=1614289view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 09:16:28 2014
@@ -34,12 +34,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56612
- Correct parse {'\'\''} in JSPs
- http://people.apache.org/~markt/patches/2014-06-11-bug56612-tc6-v1.patch
- +1: markt, kkolinko, schultz
- -1:
-
* Use if/elseif for alternative branches.
http://svn.apache.org/r1601909
+1: kkolinko, markt, schultz
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1614289r1=1614288r2=1614289view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Tue Jul 29
09:16:28 2014
@@ -721,7 +721,7 @@ class Parser implements TagConstants {
// XXX could move this logic to JspReader
last = reader.mark(); // XXX somewhat wasteful
currentChar = reader.nextChar();
-if (currentChar == '\\' (singleQuoted || doubleQuoted)) {
+while (currentChar == '\\' (singleQuoted || doubleQuoted)) {
// skip character following '\' within quotes
reader.nextChar();
currentChar = reader.nextChar();
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1614289r1=1614288r2=1614289view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jul 29 09:16:28 2014
@@ -77,6 +77,10 @@
bug56561/bug: Avoid codeNoSuchElementException/code while
handling attributes with empty string value. (violetagg)
/fix
+ fix
+bug56612/bug: Correctly parse consecutive escaped single quotes
when
+used in an EL expression. (markt)
+ /fix
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56612] Jasper is not able to parse two consecutive escaped single quotes in EL
https://issues.apache.org/bugzilla/show_bug.cgi?id=56612 --- Comment #2 from Mark Thomas ma...@apache.org --- This has been fixed in 6.0.x and will be included in 6.0.42 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614290 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Parser.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jul 29 09:24:40 2014
New Revision: 1614290
URL: http://svn.apache.org/r1614290
Log:
Use if/elseif for alternative branches.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/tc7.0.x/trunk:r1601909
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1614290r1=1614289r2=1614290view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 09:24:40 2014
@@ -34,11 +34,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Use if/elseif for alternative branches.
- http://svn.apache.org/r1601909
- +1: kkolinko, markt, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
http://people.apache.org/~markt/patches/2014-06-18-bug56334%23c15-tc6-v1.patch
+1: markt, kkolinko
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1614290r1=1614289r2=1614290view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Tue Jul 29
09:24:40 2014
@@ -728,10 +728,11 @@ class Parser implements TagConstants {
}
if (currentChar == -1)
err.jspError(start, jsp.error.unterminated, type + {);
-if (currentChar == '' !singleQuoted)
+if (currentChar == '' !singleQuoted) {
doubleQuoted = !doubleQuoted;
-if (currentChar == '\'' !doubleQuoted)
+} else if (currentChar == '\'' !doubleQuoted) {
singleQuoted = !singleQuoted;
+}
} while (currentChar != '}' || (singleQuoted || doubleQuoted));
new Node.ELExpression(type, reader.getText(start, last), start,
parent);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1614290r1=1614289r2=1614290view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jul 29 09:24:40 2014
@@ -81,6 +81,11 @@
bug56612/bug: Correctly parse consecutive escaped single quotes
when
used in an EL expression. (markt)
/fix
+ scode
+Use codeif { ... } else if { ... }/code rather than multiple
+codeif { ... }/code for alternative branches in the JSP parser.
+(kkolinko)
+ /scode
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56785] NullPointer in processAnnotationsFile while Applicaiton Startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56785 Juergen Sussner juergen.suss...@gmail.com changed: What|Removed |Added CC||juergen.suss...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614292 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/core/StandardServer.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jul 29 09:30:39 2014
New Revision: 1614292
URL: http://svn.apache.org/r1614292
Log:
Workaroud https://issues.apache.org/bugzilla/show_bug.cgi?id=56684
Don't shutdown if shutdown port experiences a SocketTimeoutException
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1608963,1609061
Merged /tomcat/tc7.0.x/trunk:r1609079
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1614292r1=1614291r2=1614292view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 09:30:39 2014
@@ -51,12 +51,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Workaroud https://issues.apache.org/bugzilla/show_bug.cgi?id=56684
- Don't shutdown if shutdown port experiences a SocketTimeoutException
- http://svn.apache.org/r1609079
- +1: markt, kkolinko, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56661
Support using AJP request attribute AJP_LOCAL_ADDR to fix getLocalAddr().
Backport of r1609593 from trunk resp. r1609606 from tc7.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1614292r1=1614291r2=1614292view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Tue Jul 29 09:30:39 2014
@@ -197,6 +197,7 @@ standardServer.initialize.initialized=Th
standardServer.start.connectors=At least one connector is not associated with
any container
standardServer.start.started=This server has already been started
standardServer.stop.notStarted=This server has not yet been started
+standardServer.accept.timeout=The socket listening for the shutdown command
experienced an unexpected timeout [{0}] milliseconds after the call to
accept(). Is this an instance of bug 56684?
standardService.connector.initFailed=Failed to initialize connector [{0}]
standardService.connector.pauseFailed=Failed to pause connector [{0}]
standardService.connector.startFailed=Failed to start connector [{0}]
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1614292r1=1614291r2=1614292view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java Tue
Jul 29 09:30:39 2014
@@ -5,20 +5,17 @@
* 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.
*/
-
-
package org.apache.catalina.core;
-
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
@@ -26,6 +23,7 @@ import java.io.InputStream;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.net.SocketTimeoutException;
import java.security.AccessControlException;
import java.util.Random;
@@ -59,10 +57,10 @@ import org.apache.tomcat.util.modeler.Re
*
*/
public final class StandardServer
-implements Lifecycle, Server, MBeanRegistration
+implements Lifecycle, Server, MBeanRegistration
{
private static Log log = LogFactory.getLog(StandardServer.class);
-
+
// -- Constants
@@ -376,7 +374,7 @@ public final class StandardServer
/**
* Wait until a proper shutdown command is received, then return.
- * This keeps the main thread alive - the thread pool listening for http
+ * This keeps the main thread alive - the thread pool listening for http
* connections is
[Bug 56684] java7: java.net.SocketTimeoutException: Accept timed out
https://issues.apache.org/bugzilla/show_bug.cgi?id=56684 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #11 from Mark Thomas ma...@apache.org --- Work around added to 6.0.x for 6.0.42 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614294 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/ajp/ java/org/apache/jk/common/ java/org/apache/jk/core/ webapps/docs/
Author: markt
Date: Tue Jul 29 09:38:57 2014
New Revision: 1614294
URL: http://svn.apache.org/r1614294
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56661
Support using AJP request attribute AJP_LOCAL_ADDR to fix getLocalAddr().
Backport of r1609593 from trunk resp. r1609606 from tc7.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/AjpConstants.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1614294r1=1614293r2=1614294view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 09:38:57 2014
@@ -51,13 +51,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56661
- Support using AJP request attribute AJP_LOCAL_ADDR to fix getLocalAddr().
- Backport of r1609593 from trunk resp. r1609606 from tc7.
- http://people.apache.org/~rjung/patches/getLocalAddr-tc6.patch
- +1: rjung, kkolinko, schultz
- -1:
-
PATCHES/ISSUES THAT ARE STALLED:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1614294r1=1614293r2=1614294view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue
Jul 29 09:38:57 2014
@@ -620,8 +620,11 @@ public class AjpAprProcessor implements
} else if (actionCode == ActionCode.ACTION_REQ_LOCAL_ADDR_ATTRIBUTE) {
-// Copy from local name for now, which should simply be an address
-request.localAddr().setString(request.localName().toString());
+// Automatically populated during prepareRequest() when using
+// modern AJP forwarder, otherwise copy from local name
+if (request.localAddr().isNull()) {
+request.localAddr().setString(request.localName().toString());
+}
} else if (actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY) {
@@ -767,13 +770,15 @@ public class AjpAprProcessor implements
requestHeaderMessage.getBytes(tmpMB);
String v = tmpMB.toString();
/*
- * AJP13 misses to forward the remotePort.
- * Allow the AJP connector to add this info via
- * a private request attribute.
- * We will accept the forwarded data as the remote port,
- * and remove it from the public list of request attributes.
+ * AJP13 misses to forward the local IP address and the
+ * remote port. Allow the AJP connector to add this info via
+ * private request attributes.
+ * We will accept the forwarded data and remove it from the
+ * public list of request attributes.
*/
-if(n.equals(Constants.SC_A_REQ_REMOTE_PORT)) {
+if(n.equals(Constants.SC_A_REQ_LOCAL_ADDR)) {
+request.localAddr().setString(v);
+} else if(n.equals(Constants.SC_A_REQ_REMOTE_PORT)) {
try {
request.setRemotePort(Integer.parseInt(v));
} catch (NumberFormatException nfe) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1614294r1=1614293r2=1614294view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Jul
29 09:38:57 2014
@@ -625,8 +625,11 @@ public class AjpProcessor implements Act
} else if (actionCode == ActionCode.ACTION_REQ_LOCAL_ADDR_ATTRIBUTE) {
-// Copy from local name for now, which should simply be an address
-request.localAddr().setString(request.localName().toString());
+// Automatically populated during prepareRequest() when using
+// modern AJP forwarder, otherwise copy from local name
+if (request.localAddr().isNull()) {
+
[Bug 56661] ServletRequest#getLocalAddr() returns the hostname, not the IP address
https://issues.apache.org/bugzilla/show_bug.cgi?id=56661 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #17 from Mark Thomas ma...@apache.org --- Fixed in 6.0.x for 6.0.42 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56787] New: Simplified jndi name parsing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56787 Bug ID: 56787 Summary: Simplified jndi name parsing Product: Tomcat 7 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: xs...@ebay.com Created attachment 31855 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31855action=edit Patch Tomcat uses JNDI to look up resource. The name of a resource needs to be parsed into a Name object. By default it is a CompositeName. Parsing a string to a CompositeName is low performance due to the following reason, 1. Call too many times of the method String.startsWith 2. Create StringBuffer instance for each component The patch provides a simplified Name implementation. The parsing is around 6 times faster than the default one. The result was get on my Macbook Pro by running TestSimpleName.testAB(). The issue is impacting the start up of tomcat server. Because there are many resource looking up when server is starting. The patch can improve the server start time. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56787] Simplified jndi name parsing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56787 --- Comment #1 from Sheldon Shao xs...@ebay.com --- Created attachment 31856 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31856action=edit Screenshot got from JProfiler where tomcat is starting -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614297 - in /tomcat/trunk: java/org/apache/tomcat/buildutil/ java/org/apache/tomcat/util/net/jsse/openssl/ res/checkstyle/
Author: markt
Date: Tue Jul 29 09:50:00 2014
New Revision: 1614297
URL: http://svn.apache.org/r1614297
Log:
Rename enumeration to the singular form for consistency
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
- copied, changed from r1614287,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Ciphers.java
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/trunk/res/checkstyle/org-import-control.xml
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1614297r1=1614296r2=1614297view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Tue Jul 29
09:50:00 2014
@@ -16,14 +16,34 @@
*/
package org.apache.tomcat.buildutil;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+
+import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Ant task that submits a file to the Symantec code-signing service.
@@ -32,6 +52,9 @@ public class SignCode extends Task {
private final ListFileSet filesets = new ArrayList();
+private static String USERNAME = AOOAPI;
+private static String PASSWORD = Demo1234!;
+private static String PARTNERCODE = 4615797APA95264;
public void addFileset(FileSet fileset) {
filesets.add(fileset);
@@ -53,9 +76,151 @@ public class SignCode extends Task {
for (int i = 0; i files.length; i++) {
File file = new File(basedir, files[i]);
filesToSign.add(file);
-log(TODO: Sign + file.getAbsolutePath());
}
}
}
+
+try {
+// Construct the signing request
+log(Constructing the code signing request);
+
+// Create the SOAP message
+MessageFactory factory =
MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
+SOAPMessage message = factory.createMessage();
+
+// Populate envelope
+SOAPPart soapPart = message.getSOAPPart();
+SOAPEnvelope envelope = soapPart.getEnvelope();
+
envelope.addNamespaceDeclaration(soapenv,http://schemas.xmlsoap.org/soap/envelope/;);
+
envelope.addNamespaceDeclaration(cod,http://api.ws.symantec.com/webtrust/codesigningservice;);
+
+SOAPBody body = envelope.getBody();
+
+SOAPElement requestSigning =
+body.addChildElement(requestSigning, cod);
+
+SOAPElement requestSigningRequest =
+requestSigning.addChildElement(requestSigningRequest,
cod);
+
+SOAPElement authToken =
requestSigningRequest.addChildElement(authToken, cod);
+SOAPElement userName = authToken.addChildElement(userName,
cod);
+userName.addTextNode(USERNAME);
+SOAPElement password = authToken.addChildElement(password,
cod);
+password.addTextNode(PASSWORD);
+SOAPElement partnerCode = authToken.addChildElement(partnerCode,
cod);
+partnerCode.addTextNode(PARTNERCODE);
+
+SOAPElement applicationName =
+requestSigningRequest.addChildElement(applicationName,
cod);
+applicationName.addTextNode(Apache Tomcat);
+
+SOAPElement applicationVersion =
+
requestSigningRequest.addChildElement(applicationVersion, cod);
+applicationVersion.addTextNode(8.0.x trunk);
+
+SOAPElement signingServiceName =
+
requestSigningRequest.addChildElement(signingServiceName, cod);
+signingServiceName.addTextNode(Microsoft Signing);
+
+SOAPElement commaDelimitedFileNames =
+
[Bug 56787] Simplified jndi name parsing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56787 Sheldon Shao xs...@ebay.com changed: What|Removed |Added Attachment #31855|0 |1 is patch|| -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/286 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1614297 Blamelist: markt BUILD FAILED: failed compile sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614307 - in /tomcat/trunk: java/org/apache/tomcat/buildutil/SignCode.java res/checkstyle/org-import-control.xml
Author: markt
Date: Tue Jul 29 11:04:26 2014
New Revision: 1614307
URL: http://svn.apache.org/r1614307
Log:
Revert unintentional code signing changes from r1614297
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/trunk/res/checkstyle/org-import-control.xml
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1614307r1=1614306r2=1614307view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Tue Jul 29
11:04:26 2014
@@ -16,34 +16,14 @@
*/
package org.apache.tomcat.buildutil;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
-
-import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* Ant task that submits a file to the Symantec code-signing service.
@@ -52,9 +32,6 @@ public class SignCode extends Task {
private final ListFileSet filesets = new ArrayList();
-private static String USERNAME = AOOAPI;
-private static String PASSWORD = Demo1234!;
-private static String PARTNERCODE = 4615797APA95264;
public void addFileset(FileSet fileset) {
filesets.add(fileset);
@@ -76,151 +53,9 @@ public class SignCode extends Task {
for (int i = 0; i files.length; i++) {
File file = new File(basedir, files[i]);
filesToSign.add(file);
+log(TODO: Sign + file.getAbsolutePath());
}
}
}
-
-try {
-// Construct the signing request
-log(Constructing the code signing request);
-
-// Create the SOAP message
-MessageFactory factory =
MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
-SOAPMessage message = factory.createMessage();
-
-// Populate envelope
-SOAPPart soapPart = message.getSOAPPart();
-SOAPEnvelope envelope = soapPart.getEnvelope();
-
envelope.addNamespaceDeclaration(soapenv,http://schemas.xmlsoap.org/soap/envelope/;);
-
envelope.addNamespaceDeclaration(cod,http://api.ws.symantec.com/webtrust/codesigningservice;);
-
-SOAPBody body = envelope.getBody();
-
-SOAPElement requestSigning =
-body.addChildElement(requestSigning, cod);
-
-SOAPElement requestSigningRequest =
-requestSigning.addChildElement(requestSigningRequest,
cod);
-
-SOAPElement authToken =
requestSigningRequest.addChildElement(authToken, cod);
-SOAPElement userName = authToken.addChildElement(userName,
cod);
-userName.addTextNode(USERNAME);
-SOAPElement password = authToken.addChildElement(password,
cod);
-password.addTextNode(PASSWORD);
-SOAPElement partnerCode = authToken.addChildElement(partnerCode,
cod);
-partnerCode.addTextNode(PARTNERCODE);
-
-SOAPElement applicationName =
-requestSigningRequest.addChildElement(applicationName,
cod);
-applicationName.addTextNode(Apache Tomcat);
-
-SOAPElement applicationVersion =
-
requestSigningRequest.addChildElement(applicationVersion, cod);
-applicationVersion.addTextNode(8.0.x trunk);
-
-SOAPElement signingServiceName =
-
requestSigningRequest.addChildElement(signingServiceName, cod);
-signingServiceName.addTextNode(Microsoft Signing);
-
-SOAPElement commaDelimitedFileNames =
-
requestSigningRequest.addChildElement(commaDelimitedFileNames, cod);
-
commaDelimitedFileNames.addTextNode(getFileNames(filesToSign.size()));
-
-SOAPElement application =
-requestSigningRequest.addChildElement(application,
cod);
-application.addTextNode(getApplicationString(filesToSign));
-
-// Send the message
-
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/287 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1614307 Blamelist: markt BUILD FAILED: exception compile_1 upload_3 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614309 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: violetagg Date: Tue Jul 29 11:18:48 2014 New Revision: 1614309 URL: http://svn.apache.org/r1614309 Log: Updates (excluding docs) for 7.0.55 release Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-7.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1614309r1=1614308r2=1614309view=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Tue Jul 29 11:18:48 2014 @@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to # - Tomcat versions - tomcat60=6.0.41 -tomcat70=7.0.54 +tomcat70=7.0.55 tomcat80=8.0.9 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1614309r1=1614308r2=1614309view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Jul 29 11:18:48 2014 @@ -64,8 +64,8 @@ release Version nameLatest Stable 7.0.x Release/name -created2014-05-22/created -revision7.0.54/revision +created2014-07-27/created +revision7.0.55/revision /Version /release release Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1614309r1=1614308r2=1614309view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Tue Jul 29 11:18:48 2014 @@ -204,8 +204,8 @@ div class=text a href=https://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a | -a href=#7.0.547.0.54/a | -a href=[preferred]tomcat/tomcat-7/v7.0.54 rel=nofollowBrowse/a | +a href=#7.0.557.0.55/a | +a href=[preferred]tomcat/tomcat-7/v7.0.55 rel=nofollowBrowse/a | a href=http://archive.apache.org/dist/tomcat/tomcat-7;Archives/a /div @@ -251,12 +251,12 @@ /div -h3 id=7.0.547.0.54/h3 +h3 id=7.0.557.0.55/h3 div class=text p Please see the - a href=[preferred]tomcat/tomcat-7/v7.0.54/README.html rel=nofollowREADME/a + a href=[preferred]tomcat/tomcat-7/v7.0.55/README.html rel=nofollowREADME/a file for packaging information. It explains what every distribution contains. /p @@ -272,44 +272,44 @@ li -a href=[preferred]tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.zip rel=nofollowzip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.zip rel=nofollowzip/a +(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.zip.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.tar.gz rel=nofollowtar.gz/a -(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.tar.gz.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.tar.gz.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.tar.gz rel=nofollowtar.gz/a +(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.tar.gz.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.tar.gz.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54-windows-x86.zip rel=nofollow32-bit Windows zip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54-windows-x86.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54-windows-x86.zip.md5;md5/a) +a
svn commit: r5976 - /release/tomcat/tomcat-7/v7.0.54/
Author: violetagg Date: Tue Jul 29 11:20:20 2014 New Revision: 5976 Log: Remove 7.0.54 Removed: release/tomcat/tomcat-7/v7.0.54/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614310 - in /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl: ./ TestCipher.java
Author: markt
Date: Tue Jul 29 11:20:42 2014
New Revision: 1614310
URL: http://svn.apache.org/r1614310
Log:
Start to add some tests for the OpenSSL to JSSE mapping.
This test currently fails so it is commented out while I work my way through
the failures.
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(with props)
Added: tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614310view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Jul 29 11:20:42 2014
@@ -0,0 +1,63 @@
+package org.apache.tomcat.util.net.jsse.openssl;
+
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.catalina.util.IOTools;
+import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
+import org.junit.Assert;
+
+public class TestCipher {
+
+/**
+ * Checks that every cipher suite returned by OpenSSL is mapped to at least
+ * one cipher suite that is recognised by JSSE or is a cipher suite known
+ * not to be supported by JSSE.
+ */
+//@Test
+public void testAllOpenSSlCiphersMapped() throws Exception {
+SetString openSSLCipherSuites = getOpenSSLCiphersAsSet(ALL);
+
+for (String openSSLCipherSuite : openSSLCipherSuites) {
+ListString jsseCipherSuites =
+
OpenSSLCipherConfigurationParser.parseExpression(openSSLCipherSuite);
+Assert.assertTrue(The OpenSSL cipher suite + openSSLCipherSuite
+
+ does not map to a JSSE cipher suite,
jsseCipherSuites.size() 0);
+}
+}
+
+
+private static SetString getOpenSSLCiphersAsSet(String specification)
throws Exception {
+String[] ciphers =
getOpenSSLCiphersAsExpression(specification).split(:);
+SetString result = new HashSet(ciphers.length);
+for (String cipher : ciphers) {
+result.add(cipher);
+}
+return result;
+
+}
+
+
+private static String getOpenSSLCiphersAsExpression(String specification)
throws Exception {
+// TODO The path to OpenSSL needs to be made configurable
+StringBuilder cmd = new StringBuilder(/opt/local/bin/openssl
ciphers);
+if (specification != null) {
+cmd.append(' ');
+cmd.append(specification);
+}
+Process process = Runtime.getRuntime().exec(cmd.toString());
+InputStream stderr = process.getErrorStream();
+InputStream stdout = process.getInputStream();
+
+ByteArrayOutputStream stderrBytes = new ByteArrayOutputStream();
+IOTools.flow(stderr, stderrBytes);
+//String errorText = stderrBytes.toString();
+//Assert.assertTrue(errorText, errorText.length() == 0);
+
+ByteArrayOutputStream stdoutBytes = new ByteArrayOutputStream();
+IOTools.flow(stdout, stdoutBytes);
+return stdoutBytes.toString();
+}
+}
Propchange:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614317 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: violetagg Date: Tue Jul 29 12:10:09 2014 New Revision: 1614317 URL: http://svn.apache.org/r1614317 Log: Update docs for Apache Tomcat 7.0.55 release. [This commit notification would consist of 71 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614332 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Tue Jul 29 12:58:35 2014
New Revision: 1614332
URL: http://svn.apache.org/r1614332
Log:
Add missing cipher using parameters defined in ssl2_lib.c form OpenSSL 1.0.1h
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614332r1=1614331r2=1614332view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Tue
Jul 29 12:58:35 2014
@@ -18,7 +18,20 @@
package org.apache.tomcat.util.net.jsse.openssl;
/**
- * All Ciphers for SSL/TSL.
+ * All the standard cipher suites for SSL/TSL.
+ *
+ * TODO Change the name of the enumeration entry to the registry name for the
+ * cipher (not the Java standard name which may vary between Java
+ * implementations).
+ *
+ * @see a
href=http://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4;
+ * The cipher suite registry/a
+ * @see a href=https://www.thesprawl.org/research/tls-and-ssl-cipher-suites/;
+ * Another list of cipher suites with some non-standard IDs/a
+ * @see a
href=http://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#ciphersuites;
+ * Oracle standard names for cipher suites/a
+ * @see a href=https://www.openssl.org/docs/apps/ciphers.html;
+ * Mapping of OpenSSL cipher suites names to registry names/a
*/
enum Cipher {
/* The RSA ciphers */
@@ -2161,7 +2174,7 @@ enum Cipher {
false,
168,
168
-);
+),
/* TEMP_GOST_TLS*/
/*
@@ -2217,6 +2230,23 @@ enum Cipher {
256,
256
};*/
+
+// Cipher 0x030080 / 0x040080
+SSL2_RC2_CBC_128_CBC_WITH_MD5(
+RC2-CBC-MD5,
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.RC2,
+MessageDigest.MD5,
+Protocol.SSLv2,
+false,
+EncryptionLevel.MEDIUM,
+true,
+128,
+128
+);
+
+
private final String openSSLAlias;
private final KeyExchange kx;
private final Authentication au;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614336 - in /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl: Cipher.java OpenSSLCipherConfigurationParser.java
Author: markt
Date: Tue Jul 29 13:15:07 2014
New Revision: 1614336
URL: http://svn.apache.org/r1614336
Log:
Preparation for supporting more than one JSSE name for a cipher (different
implementations may use different names) and for renaming enumeration entries
to use the names from the TLS cipher registry to make it clear which cipher is
being referred to.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614336r1=1614335r2=1614336view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Tue
Jul 29 13:15:07 2014
@@ -17,6 +17,10 @@
package org.apache.tomcat.util.net.jsse.openssl;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* All the standard cipher suites for SSL/TSL.
*
@@ -37,6 +41,7 @@ enum Cipher {
/* The RSA ciphers */
// Cipher 01
SSL_RSA_WITH_NULL_MD5(NULL-MD5,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.eNULL,
@@ -49,6 +54,7 @@ enum Cipher {
0),
// Cipher 02
SSL_RSA_WITH_NULL_SHA(NULL-SHA,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.eNULL,
@@ -61,6 +67,7 @@ enum Cipher {
0),
// Cipher 03
SSL_RSA_EXPORT_WITH_RC4_40_MD5(EXP-RC4-MD5,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.RC4,
@@ -73,6 +80,7 @@ enum Cipher {
128),
// Cipher 04
SSL_RSA_WITH_RC4_128_MD5(RC4-MD5,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.RC4,
@@ -85,6 +93,7 @@ enum Cipher {
128),
// Cipher 05
SSL_RSA_WITH_RC4_128_SHA(RC4-SHA,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.RC4,
@@ -97,6 +106,7 @@ enum Cipher {
128),
// Cipher 06
SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5(EXP-RC2-CBC-MD5,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.RC2,
@@ -109,6 +119,7 @@ enum Cipher {
128),
// Cipher 07
SSL_RSA_WITH_IDEA_CBC_SHA(IDEA-CBC-SHA,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.IDEA,
@@ -121,6 +132,7 @@ enum Cipher {
128),
// Cipher 08
SSL_RSA_EXPORT_WITH_DES40_CBC_SHA(EXP-DES-CBC-SHA,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.DES,
@@ -133,6 +145,7 @@ enum Cipher {
56),
// Cipher 09
SSL_RSA_WITH_DES_CBC_SHA(DES-CBC-SHA,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.DES,
@@ -145,6 +158,7 @@ enum Cipher {
56),
// Cipher 0A
SSL_RSA_WITH_3DES_EDE_CBC_SHA(DES-CBC3-SHA,
+null,
KeyExchange.RSA,
Authentication.RSA,
Encryption.TRIPLE_DES,
@@ -158,6 +172,7 @@ enum Cipher {
/* The DH ciphers */
// Cipher 0B
SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA(EXP-DH-DSS-DES-CBC-SHA,
+null,
KeyExchange.DHd,
Authentication.DH,
Encryption.DES,
@@ -170,6 +185,7 @@ enum Cipher {
56),
// Cipher 0C
SSL_DH_DSS_WITH_DES_CBC_SHA(DH-DSS-DES-CBC-SHA,
+null,
KeyExchange.DHd,
Authentication.DH,
Encryption.DES,
@@ -182,6 +198,7 @@ enum Cipher {
56),
// Cipher 0D
SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA(DH-DSS-DES-CBC3-SHA,
+null,
KeyExchange.DHd,
Authentication.DH,
Encryption.TRIPLE_DES,
@@ -194,6 +211,7 @@ enum Cipher {
168),
// Cipher 0E
SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA(EXP-DH-RSA-DES-CBC-SHA,
+null,
KeyExchange.DHr,
Authentication.DH,
Encryption.DES,
@@ -206,6 +224,7 @@ enum Cipher {
56),
// Cipher 0F
SSL_DH_RSA_WITH_DES_CBC_SHA(DH-RSA-DES-CBC-SHA,
+null,
KeyExchange.DHr,
Authentication.DH,
Encryption.DES,
@@ -218,6 +237,7 @@ enum Cipher {
56),
// Cipher 10
SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA(DH-RSA-DES-CBC3-SHA,
+null,
KeyExchange.DHr,
Authentication.DH,
Encryption.TRIPLE_DES,
@@ -231,6
svn commit: r1614341 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Tue Jul 29 13:25:00 2014
New Revision: 1614341
URL: http://svn.apache.org/r1614341
Log:
Use standard name. Add comment with cipher ID.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614341r1=1614340r2=1614341view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Tue
Jul 29 13:25:00 2014
@@ -2322,20 +2322,6 @@ enum Cipher {
128,
128
),
-// DES_64_CBC_WITH_MD5
-SSL_CK_DES_64_CBC_WITH_MD5(DES-CBC-MD5,
-null,
-KeyExchange.RSA,
-Authentication.RSA,
-Encryption.DES,
-MessageDigest.MD5,
-Protocol.SSLv2,
-false,
-EncryptionLevel.LOW,
-false,
-56,
-56
-),
// DES_192_EDE3_CBC_WITH_MD5
SSL_CK_DES_192_EDE3_CBC_WITH_MD5(DES-CBC3-MD5,
null,
@@ -2424,7 +2410,22 @@ enum Cipher {
true,
128,
128
-);
+),
+// Cipher 0x060040
+SSL2_DES_64_CBC_WITH_MD5(
+DES-CBC-MD5,
+null,
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.DES,
+MessageDigest.MD5,
+Protocol.SSLv2,
+false,
+EncryptionLevel.LOW,
+false,
+56,
+56
+);
private final String openSSLAlias;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614342 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Tue Jul 29 13:26:54 2014
New Revision: 1614342
URL: http://svn.apache.org/r1614342
Log:
Make test for OpenSSL to JSSE mapping for sophisticated.
Still commented out as there are still failures that need to be resolved.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614342r1=1614341r2=1614342view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Jul 29 13:26:54 2014
@@ -1,6 +1,8 @@
package org.apache.tomcat.util.net.jsse.openssl;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -23,8 +25,26 @@ public class TestCipher {
for (String openSSLCipherSuite : openSSLCipherSuites) {
ListString jsseCipherSuites =
OpenSSLCipherConfigurationParser.parseExpression(openSSLCipherSuite);
-Assert.assertTrue(The OpenSSL cipher suite + openSSLCipherSuite
+
- does not map to a JSSE cipher suite,
jsseCipherSuites.size() 0);
+
+for (JsseImpl jsseImpl : JSSE_IMPLS) {
+boolean found = false;
+for (String jsseCipherSuite : jsseCipherSuites) {
+if (jsseImpl.getStandardNames().contains(jsseCipherSuite))
{
+found = true;
+Assert.assertFalse(Mapping found in +
jsseImpl.getVendor() +
+'s JSSE implementation for +
openSSLCipherSuite +
+ when none was expected,
+
jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite));
+break;
+}
+}
+if (!found) {
+Assert.assertTrue(No mapping found in +
jsseImpl.getVendor() +
+'s JSSE implementation for + openSSLCipherSuite
+
+ when one was expected,
+
jsseImpl.getOpenSslUnmapped().contains(openSSLCipherSuite));
+}
+}
}
}
@@ -60,4 +80,388 @@ public class TestCipher {
IOTools.flow(stdout, stdoutBytes);
return stdoutBytes.toString();
}
+
+
+/**
+ * These are all the Oracle standard Java names for cipher suites taken
from
+ *
http://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#ciphersuites
+ * on 15th July 2014.
+ */
+private static final SetString CIPHER_SUITE_STANDARD_NAMES_ORACLE =
+Collections.unmodifiableSet(new HashSet(Arrays.asList(
+SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA,
+SSL_DH_anon_EXPORT_WITH_RC4_40_MD5,
+SSL_DH_anon_WITH_3DES_EDE_CBC_SHA,
+TLS_DH_anon_WITH_AES_128_CBC_SHA,
+TLS_DH_anon_WITH_AES_128_CBC_SHA256,
+TLS_DH_anon_WITH_AES_128_GCM_SHA256,
+TLS_DH_anon_WITH_AES_256_CBC_SHA,
+TLS_DH_anon_WITH_AES_256_CBC_SHA256,
+TLS_DH_anon_WITH_AES_256_GCM_SHA384,
+TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA,
+TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256,
+TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA,
+TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256,
+SSL_DH_anon_WITH_DES_CBC_SHA,
+SSL_DH_anon_WITH_RC4_128_MD5,
+TLS_DH_anon_WITH_SEED_CBC_SHA,
+SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
+SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA,
+TLS_DH_DSS_WITH_AES_128_CBC_SHA,
+TLS_DH_DSS_WITH_AES_128_CBC_SHA256,
+TLS_DH_DSS_WITH_AES_128_GCM_SHA256,
+TLS_DH_DSS_WITH_AES_256_CBC_SHA,
+TLS_DH_DSS_WITH_AES_256_CBC_SHA256,
+TLS_DH_DSS_WITH_AES_256_GCM_SHA384,
+TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
+TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256,
+TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
+TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256,
+SSL_DH_DSS_WITH_DES_CBC_SHA,
+TLS_DH_DSS_WITH_SEED_CBC_SHA,
+SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
+SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA,
+TLS_DH_RSA_WITH_AES_128_CBC_SHA,
+TLS_DH_RSA_WITH_AES_128_CBC_SHA256,
+TLS_DH_RSA_WITH_AES_128_GCM_SHA256,
+TLS_DH_RSA_WITH_AES_256_CBC_SHA,
+TLS_DH_RSA_WITH_AES_256_CBC_SHA256,
+TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
+TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
+
[Bug 56788] New: Set Version information in uninstaller on Windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=56788 Bug ID: 56788 Summary: Set Version information in uninstaller on Windows Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Packaging Assignee: dev@tomcat.apache.org Reporter: zigarn+apa...@gmail.com There are no version information for Tomcat when listing softwares in Windows. Cf. attached screenshot to understand. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56788] Set Version information in uninstaller on Windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=56788 --- Comment #1 from Alexandre Garnier zigarn+apa...@gmail.com --- Created attachment 31857 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31857action=edit Windows software list -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56788] Set Version information in uninstaller on Windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=56788 --- Comment #2 from Alexandre Garnier zigarn+apa...@gmail.com --- Created attachment 31858 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31858action=edit Patch adding DisplayVersion on uninstaller Patch to add `DisplayVersion` on uninstaller. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/291 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1614342 Blamelist: markt BUILD FAILED: failed compile sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614347 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Tue Jul 29 13:44:27 2014
New Revision: 1614347
URL: http://svn.apache.org/r1614347
Log:
IBM cipher suite names can use SSL_ or TLS_ at the start so modify mapping test
to take account of this.
Test still fails so it is still commented out.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614347r1=1614346r2=1614347view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Jul 29 13:44:27 2014
@@ -10,6 +10,7 @@ import java.util.Set;
import org.apache.catalina.util.IOTools;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
import org.junit.Assert;
+//import org.junit.Test;
public class TestCipher {
@@ -314,9 +315,13 @@ public class TestCipher {
* These are all the IBM standard Java names for cipher suites taken from
*
http://www-01.ibm.com/support/knowledgecenter/SSYKE2_7.0.0/com.ibm.java.security.component.71.doc/security-component/jsse2Docs/ciphersuites.html?lang=en
* on 29th July 2014.
+ * br
+ * Note that IBM cipher suites names can begin with TLS or SSL.
*/
-private static final SetString CIPHER_SUITE_STANDARD_NAMES_IBM =
-Collections.unmodifiableSet(new HashSet(Arrays.asList(
+private static final SetString CIPHER_SUITE_STANDARD_NAMES_IBM;
+
+static {
+SetString sslNames = new HashSet(Arrays.asList(
SSL_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
SSL_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
SSL_RSA_WITH_AES_256_CBC_SHA256,
@@ -416,7 +421,18 @@ public class TestCipher {
SSL_KRB5_EXPORT_WITH_RC4_40_MD5,
SSL_KRB5_EXPORT_WITH_DES_CBC_40_SHA,
SSL_KRB5_EXPORT_WITH_DES_CBC_40_MD5,
-SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5)));
+SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5));
+
+SetString allNames = new HashSet();
+
+allNames.addAll(sslNames);
+
+for (String sslName : sslNames) {
+allNames.add(TLS + sslName.substring(3));
+}
+
+CIPHER_SUITE_STANDARD_NAMES_IBM =
Collections.unmodifiableSet(allNames);
+}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614351 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Tue Jul 29 13:48:33 2014
New Revision: 1614351
URL: http://svn.apache.org/r1614351
Log:
Simplify construction
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614351r1=1614350r2=1614351view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Tue
Jul 29 13:48:33 2014
@@ -2447,14 +2447,16 @@ enum Cipher {
*/
private final int alg_bits;
-Cipher(String openSSLAlias, SetString jsseAltNames, KeyExchange kx,
Authentication au,
+Cipher(String openSSLAlias, String[] jsseAltNames, KeyExchange kx,
Authentication au,
Encryption enc, MessageDigest mac, Protocol protocol, boolean
export,
EncryptionLevel level, boolean fipsCompatible, int strength_bits,
int alg_bits) {
this.openSSLAlias = openSSLAlias;
SetString names = new HashSet();
if (jsseAltNames != null) {
-names.addAll(jsseAltNames);
+for (String jsseAltName : jsseAltNames) {
+names.add(jsseAltName);
+}
}
names.add(name());
this.jsseNames = Collections.unmodifiableSet(names);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/292 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1614351 Blamelist: markt BUILD FAILED: exception compile_1 upload_3 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 7.0.55 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.55. Apache Tomcat is an open source software implementation of the Java Servlet, JavaServer Pages and Java Expression Language technologies. This release contains a number of bug fixes and improvements compared to version 7.0.54. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html Note: This version has 4 zip binaries: a generic one and three bundled with Tomcat native binaries for Windows operating systems running on different CPU architectures. Note: Use of the JSR-356 Java WebSocket 1.0 implementation requires Java 7. Note: If you use the APR/native AJP or HTTP connector you *must* upgrade to version 1.1.31 or later of the APR/native library. Downloads: http://tomcat.apache.org/download-70.cgi Migration guides from Apache Tomcat 5.5.x and 6.0.x: http://tomcat.apache.org/migration.html
[Bug 56780] IBM Java: server.startup gives error java.lang.IllegalArgumentException: Only TLS1.2 protocol can be enabl ed in SP800_131 strict mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=56780 --- Comment #2 from Karl Freburger karl.frebur...@gmail.com --- If the IBM JVM is configured for strict SP800-131a mode, the only acceptable value (currently) for the protocol would be TLSv1.2. If strict SP800-131a mode is NOT on, many other values are acceptable (TLS, etc). Note that if there was ever a TLSv1.3, then that would also become an acceptable value for the protocol. If I read the code correctly (that's a big IF), the appropriate action here is to catch IllegalArgumentException and treat it like IOException. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Prevent Removal of Realm when directory is no...
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/11 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: fix: MethodParameters_attribute's parameters_...
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/12 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - 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-nio (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-nio 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-nio : 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-nio/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-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 25 mins 4 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-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140729-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140729.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140729-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.n io2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140729.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/servle t-api.jar:/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/tomcat -trunk/output/build/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-nio2 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-nio2 : 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-nio2/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-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 25 mins 46 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-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140729-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140729.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140729-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.tes t.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140729.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/servle t-api.jar:/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/tomcat -trunk/output/build/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump
[Bug 56789] New: DataSourceProxy.getPool() returns NULL when pool is not started
https://issues.apache.org/bugzilla/show_bug.cgi?id=56789 Bug ID: 56789 Summary: DataSourceProxy.getPool() returns NULL when pool is not started Product: Tomcat Modules Version: unspecified Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: normal Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: brenu...@gmail.com The method DataSourceProxy.getPool() returns null if the pool is not started instead of lazily initialise the pool like the other methods. Can't the method simply be rewritten to return the result of the createPool() method ? -- You are receiving this mail because: You are the assignee for the bug. - 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-bio (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-bio 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-bio : 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-bio/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-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-bio/gump_work/build_tomcat-trunk_tomcat-trunk-test-bio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 47 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-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140729-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140729.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140729-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dexecute.test.apr=false -Dexecute.test.bio=true -Dexecute.test.n io2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140729.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/servle t-api.jar:/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/tomcat -trunk/output/build/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public
Re: [GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
2014-07-29 23:38 GMT+04:00 Bill Barker billbar...@apache.org: 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-nio 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-nio : 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-nio/index.html The only failure: Test org.apache.tomcat.util.net.jsse.openssl.TestCipher FAILED [ Testsuite: org.apache.tomcat.util.net.jsse.openssl.TestCipher Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.04 sec Testcase: initializationError took 0.004 sec Caused an ERROR No runnable methods java.lang.Exception: No runnable methods at java.lang.reflect.Constructor.newInstance(Constructor.java:526) ] This is expected as the test case is a work in progress and is currently commented out. As a temporary solution I will mark the test with @Ignore. That will make junit to skip it without failing the whole test run. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614489 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: kkolinko
Date: Tue Jul 29 21:09:48 2014
New Revision: 1614489
URL: http://svn.apache.org/r1614489
Log:
Annotate a disabled (work-in-progress) test with @Ignore, so that it is
recognized and skipped,
instead of failing the whole testsuite run with No runnable methods error.
Fix checkstyle errors such as imports order and missing license header.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614489r1=1614488r2=1614489view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Jul 29 21:09:48 2014
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.tomcat.util.net.jsse.openssl;
import java.io.InputStream;
@@ -7,10 +23,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
import org.apache.catalina.util.IOTools;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
-import org.junit.Assert;
-//import org.junit.Test;
public class TestCipher {
@@ -19,7 +37,8 @@ public class TestCipher {
* one cipher suite that is recognised by JSSE or is a cipher suite known
* not to be supported by JSSE.
*/
-//@Test
+@Test
+@Ignore //FIXME: enable the test
public void testAllOpenSSlCiphersMapped() throws Exception {
SetString openSSLCipherSuites = getOpenSSLCiphersAsSet(ALL);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1614310 - in /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl: ./ TestCipher.java
2014-07-29 15:20 GMT+04:00 ma...@apache.org:
Author: markt
Date: Tue Jul 29 11:20:42 2014
New Revision: 1614310
URL: http://svn.apache.org/r1614310
Log:
Start to add some tests for the OpenSSL to JSSE mapping.
This test currently fails so it is commented out while I work my way through
the failures.
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(with props)
Added:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614310view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Jul 29 11:20:42 2014
(...)
+private static String getOpenSSLCiphersAsExpression(String
specification) throws Exception {
+// TODO The path to OpenSSL needs to be made configurable
+StringBuilder cmd = new StringBuilder(/opt/local/bin/openssl
ciphers);
BTW, I think on Windows we may put the openssl executable into
bin/native/ like we do with tcnative-1.dll when running the tests with
APR connector.
(I though that maybe we can to limit the the test to be executed only
when testing the APR connector, but Gump and Buildbot are not testing
APR. So the idea is not a good one).
+if (specification != null) {
+cmd.append(' ');
+cmd.append(specification);
+}
+Process process = Runtime.getRuntime().exec(cmd.toString());
It is better to use Runtime.exec(String[]) or use java.lang.ProcessBuilder.
IIRC, exec(String) has ambiguities in parsing the string.
There are Changes to Runtime.exec sections in Release notes for Java
7u21 and 7u25. [1][2]
[1]
http://www.oracle.com/technetwork/java/javase/7u21-relnotes-1932873.html#jruntime
[2]
http://www.oracle.com/technetwork/java/javase/7u25-relnotes-1955741.html#jruntime
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56790] New: Resizing pool.maxActive to a higher value at runtime leads to unmanaged connections
https://issues.apache.org/bugzilla/show_bug.cgi?id=56790 Bug ID: 56790 Summary: Resizing pool.maxActive to a higher value at runtime leads to unmanaged connections Product: Tomcat Modules Version: unspecified Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: normal Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: brenu...@gmail.com Resizing maxActive to a higher value on a live pool leads to untraceable/unmanaged connections. The pool accepts the new higher value and accepts to deliver new connections but the following warning message is logged: Connection doesn't fit into busy array, connection will not be traceable. When looking at the code it appears the ArrayBlockingQueue holding the busy connections is not resized and keeps its original size: the extra connections cannot be added to it. The main consequence is the pool size isn't actually increased. Connections created past the original maxActive limit will never be pooled but immediately dropped once closed by the application. I made a small unit test to illustrate the case - should I post it somewhere? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56790] Resizing pool.maxActive to a higher value at runtime leads to unmanaged connections
https://issues.apache.org/bugzilla/show_bug.cgi?id=56790 --- Comment #1 from Filip Hanik fha...@apache.org --- attach unit test here -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614542 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Wed Jul 30 05:10:22 2014
New Revision: 1614542
URL: http://svn.apache.org/r1614542
Log:
Add some SSL_... - TLS_... mappings for Oracle which uses SSL_ in some cases
Correct a standard name
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614542r1=1614541r2=1614542view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Wed
Jul 30 05:10:22 2014
@@ -329,7 +329,7 @@ enum Cipher {
168),
// Cipher 17
TLS_DH_anon_EXPORT_WITH_RC4_40_MD5(EXP-ADH-RC4-MD5,
-null,
+new String[] { SSL_DH_anon_EXPORT_WITH_RC4_40_MD5 },
KeyExchange.EDH,
Authentication.aNULL,
Encryption.RC4,
@@ -342,7 +342,7 @@ enum Cipher {
128),
// Cipher 18
TLS_DH_anon_WITH_RC4_128_MD5(ADH-RC4-MD5,
-null,
+new String[] { SSL_DH_anon_WITH_RC4_128_MD5 },
KeyExchange.EDH,
Authentication.aNULL,
Encryption.RC4,
@@ -368,7 +368,7 @@ enum Cipher {
128),
// Cipher 1A
TLS_DH_anon_WITH_DES_CBC_SHA(ADH-DES-CBC-SHA,
-null,
+new String[] { SSL_DH_anon_WITH_DES_CBC_SHA },
KeyExchange.EDH,
Authentication.aNULL,
Encryption.DES,
@@ -381,7 +381,7 @@ enum Cipher {
56),
// Cipher 1B
TLS_DH_anon_WITH_3DES_EDE_CBC_SHA(ADH-DES-CBC3-SHA,
-null,
+new String[] { SSL_DH_anon_WITH_3DES_EDE_CBC_SHA },
KeyExchange.EDH,
Authentication.aNULL,
Encryption.TRIPLE_DES,
@@ -2309,19 +2309,6 @@ enum Cipher {
40,
128
),
-// IDEA_128_CBC_WITH_MD5
-SSL_CK_IDEA_128_CBC_WITH_MD5(IDEA-CBC-MD5,
-null,
-KeyExchange.RSA,
-Authentication.RSA,
-Encryption.IDEA,
-MessageDigest.MD5,
-Protocol.SSLv2,
-false, EncryptionLevel.MEDIUM,
-false,
-128,
-128
-),
// DES_192_EDE3_CBC_WITH_MD5
SSL_CK_DES_192_EDE3_CBC_WITH_MD5(DES-CBC3-MD5,
null,
@@ -2411,6 +2398,19 @@ enum Cipher {
128,
128
),
+// Cipher 0x050080
+SSL2_IDEA_128_CBC_WITH_MD5(IDEA-CBC-MD5,
+null,
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.IDEA,
+MessageDigest.MD5,
+Protocol.SSLv2,
+false, EncryptionLevel.MEDIUM,
+false,
+128,
+128
+),
// Cipher 0x060040
SSL2_DES_64_CBC_WITH_MD5(
DES-CBC-MD5,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614543 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Wed Jul 30 05:46:12 2014
New Revision: 1614543
URL: http://svn.apache.org/r1614543
Log:
Add some SSL_... - TLS_... mappings for Oracle which uses SSL_ in some cases
Correct a few more standard names
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1614543r1=1614542r2=1614543view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Wed
Jul 30 05:46:12 2014
@@ -66,8 +66,8 @@ enum Cipher {
0,
0),
// Cipher 03
-SSL_RSA_EXPORT_WITH_RC4_40_MD5(EXP-RC4-MD5,
-null,
+TLS_RSA_EXPORT_WITH_RC4_40_MD5(EXP-RC4-MD5,
+new String[] { SSL_RSA_EXPORT_WITH_RC4_40_MD5 },
KeyExchange.RSA,
Authentication.RSA,
Encryption.RC4,
@@ -290,7 +290,7 @@ enum Cipher {
168),
// Cipher 14
TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA(EXP-EDH-RSA-DES-CBC-SHA,
-null,
+new String[] { SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA },
KeyExchange.EDH,
Authentication.RSA,
Encryption.DES,
@@ -303,7 +303,7 @@ enum Cipher {
56),
// Cipher 15
TLS_DHE_RSA_WITH_DES_CBC_SHA(EDH-RSA-DES-CBC-SHA,
-null,
+new String[] { SSL_DHE_RSA_WITH_DES_CBC_SHA },
KeyExchange.EDH,
Authentication.RSA,
Encryption.DES,
@@ -316,7 +316,7 @@ enum Cipher {
56),
// Cipher 16
TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA(EDH-RSA-DES-CBC3-SHA,
-null,
+new String[] { SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA },
KeyExchange.EDH,
Authentication.RSA,
Encryption.TRIPLE_DES,
@@ -355,7 +355,7 @@ enum Cipher {
128),
// Cipher 19
TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA(EXP-ADH-DES-CBC-SHA,
-null,
+new String[] { SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA },
KeyExchange.EDH,
Authentication.aNULL,
Encryption.DES,
@@ -2267,20 +2267,6 @@ enum Cipher {
128,
128
),
-// RC4_128_EXPORT40_WITH_MD5
-SSL_CK_RC4_128_EXPORT40_WITH_MD5(EXP-RC4-MD5,
-null,
-KeyExchange.RSA,
-Authentication.RSA,
-Encryption.RC4,
-MessageDigest.MD5,
-Protocol.SSLv2,
-true,
-EncryptionLevel.EXP40,
-false,
-40,
-128
-),
// RC2_128_CBC_WITH_MD5
SSL_CK_RC2_128_CBC_WITH_MD5(RC2-MD5,
null,
@@ -2309,20 +2295,6 @@ enum Cipher {
40,
128
),
-// DES_192_EDE3_CBC_WITH_MD5
-SSL_CK_DES_192_EDE3_CBC_WITH_MD5(DES-CBC3-MD5,
-null,
-KeyExchange.RSA,
-Authentication.RSA,
-Encryption.TRIPLE_DES,
-MessageDigest.MD5,
-Protocol.SSLv2,
-false,
-EncryptionLevel.HIGH,
-false,
-168,
-168
-),
/* TEMP_GOST_TLS*/
/*
@@ -2383,6 +2355,20 @@ enum Cipher {
256
};*/
+// Cipher 0x020080
+SSL2_RC4_128_EXPORT40_WITH_MD5(EXP-RC4-MD5,
+null,
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.RC4,
+MessageDigest.MD5,
+Protocol.SSLv2,
+true,
+EncryptionLevel.EXP40,
+false,
+40,
+128
+),
// Cipher 0x030080 / 0x040080
SSL2_RC2_CBC_128_CBC_WITH_MD5(
RC2-CBC-MD5,
@@ -2399,7 +2385,8 @@ enum Cipher {
128
),
// Cipher 0x050080
-SSL2_IDEA_128_CBC_WITH_MD5(IDEA-CBC-MD5,
+SSL2_IDEA_128_CBC_WITH_MD5(
+IDEA-CBC-MD5,
null,
KeyExchange.RSA,
Authentication.RSA,
@@ -2425,6 +2412,21 @@ enum Cipher {
false,
56,
56
+),
+// Cipher 0x0700C0
+SSL2_DES_192_EDE3_CBC_WITH_MD5(
+DES-CBC3-MD5,
+null,
+KeyExchange.RSA,
+Authentication.RSA,
+Encryption.TRIPLE_DES,
+MessageDigest.MD5,
+Protocol.SSLv2,
+false,
+EncryptionLevel.HIGH,
+false,
+168,
+168
);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1614544 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Wed Jul 30 05:51:41 2014
New Revision: 1614544
URL: http://svn.apache.org/r1614544
Log:
Complete the lists of unmapped ciphers
Test now passes but keep disabled as it currently requires openssl and that
needs to be optional
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614544r1=1614543r2=1614544view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Wed Jul 30 05:51:41 2014
@@ -70,7 +70,7 @@ public class TestCipher {
private static SetString getOpenSSLCiphersAsSet(String specification)
throws Exception {
-String[] ciphers =
getOpenSSLCiphersAsExpression(specification).split(:);
+String[] ciphers =
getOpenSSLCiphersAsExpression(specification).trim().split(:);
SetString result = new HashSet(ciphers.length);
for (String cipher : ciphers) {
result.add(cipher);
@@ -327,7 +327,10 @@ public class TestCipher {
*/
private static SetString OPENSSL_UNMAPPED_ORACLE =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
-DES-CBC-MD5)));
+DES-CBC-MD5,
+DES-CBC3-MD5,
+IDEA-CBC-MD5,
+RC2-CBC-MD5)));
/**
@@ -460,7 +463,36 @@ public class TestCipher {
*/
private static SetString OPENSSL_UNMAPPED_IBM =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
-DES-CBC-MD5)));
+ADH-CAMELLIA128-SHA,
+ADH-CAMELLIA256-SHA,
+ADH-SEED-SHA,
+CAMELLIA128-SHA,
+CAMELLIA256-SHA,
+DES-CBC-MD5,
+DES-CBC3-MD5,
+DHE-DSS-CAMELLIA128-SHA,
+DHE-DSS-CAMELLIA256-SHA,
+DHE-DSS-SEED-SHA,
+DHE-RSA-CAMELLIA128-SHA,
+DHE-RSA-CAMELLIA256-SHA,
+DHE-RSA-SEED-SHA,
+IDEA-CBC-MD5,
+IDEA-CBC-SHA,
+PSK-3DES-EDE-CBC-SHA,
+PSK-AES128-CBC-SHA,
+PSK-AES256-CBC-SHA,
+PSK-RC4-SHA,
+RC2-CBC-MD5,
+SEED-SHA,
+SRP-AES-128-CBC-SHA,
+SRP-AES-256-CBC-SHA,
+SRP-3DES-EDE-CBC-SHA,
+SRP-DSS-3DES-EDE-CBC-SHA,
+SRP-DSS-AES-128-CBC-SHA,
+SRP-DSS-AES-256-CBC-SHA,
+SRP-RSA-3DES-EDE-CBC-SHA,
+SRP-RSA-AES-128-CBC-SHA,
+SRP-RSA-AES-256-CBC-SHA)));
private static JsseImpl ORACLE_JSSE_CIPHER_IMPL = new JsseImpl(Oracle,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
