Hi Eoghan,

I thought current HTTP2 module has been synchronized with HTTP module.
I am regret that I just copied the HTTP2 module code to HTTP.

After I went through the commit log from 2006-12-16 to 2007-3-15 which contain the http modifications, I realized there are so many changes of https are not applied on HTTP2 module in the HTTP.

I am very sorry for that.

I rolled back HTTP module to reversion 518603 and will redo the merg base on the HTTP module.

Willem.

Glynn, Eoghan wrote:

Willem,

Earlier in the week I requested you reapply the Jetty5->Jetty6 changes
to the HTTP code, so as to not to lose the history and also not to lose
any modifications made to the http code after the fork.

Instead you've done this in such a way as to cause both of these issues
to occur :(

For example:

1. you've removed JettySslListener.java and replaced it with
JettySslConnectorFactory.java, thus losing the history

2. more importantly, you've also just overwritten
HttpsURLConnectionFactory and its unit test with the versions from
http2, thus losing the ciphersuite filtering feature. Similarly you've
just overwritten http SSLUtils.java with the version from http2.
I've haven't checked any of the other changes, but there may well be
other examples.

So I'd suggest that you back out this commit ASAP.

/Eoghan


-----Original Message-----
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 15 March 2007 13:45
To: [email protected]
Subject: svn commit: r518627 [1/2] - in /incubator/cxf/trunk: integration/jca/ rt/ rt/bindings/http/ rt/databinding/aegis/ rt/transports/http/ rt/transports/http/src/java/ rt/transports/http/src/main/java/org/apache/cxf/transport/http
/ rt/transports/http/src/ma...

Author: ningjiang
Date: Thu Mar 15 06:44:47 2007
New Revision: 518627

URL: http://svn.apache.org/viewvc?view=rev&rev=518627
Log:
[CXF-462] Replaced http module with http2

Added:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/JettyConnectorFactory.java
- copied unchanged from r518538, incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apac
he/cxf/transport/http/JettyConnectorFactory.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/https/JettySslConnectorFactory.java
- copied unchanged from r518538, incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apac
he/cxf/transport/https/JettySslConnectorFactory.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/https/JettySslConnectorFactoryTest.java
- copied unchanged from r518538, incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apac
he/cxf/transport/https/JettySslConnectorFactoryTest.java
Removed:
   incubator/cxf/trunk/rt/transports/http/src/java/
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/JettyListenerFactory.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/https/JettySslListenerFactory.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/http/TestHttpRequest.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/http/TestHttpResponse.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/https/JettySslListenerFactoryTest.java
Modified:
   incubator/cxf/trunk/integration/jca/pom.xml
   incubator/cxf/trunk/rt/bindings/http/pom.xml
   incubator/cxf/trunk/rt/databinding/aegis/pom.xml
   incubator/cxf/trunk/rt/pom.xml
   incubator/cxf/trunk/rt/transports/http/pom.xml
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/AbstractHTTPDestination.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/HTTPConduit.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/HTTPTransportFactory.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/JettyContextInspector.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/JettyHTTPDestination.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/JettyHTTPServerEngine.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/http/ServerEngine.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/https/HttpsURLConnectionFactory.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/https/Messages.properties
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/https/SSLSocketFactoryWrapper.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/https/SSLUtils.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/servlet/CXFServlet.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/servlet/ServletController.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach
e/cxf/transport/servlet/ServletDestination.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/http/HTTPConduitTest.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/http/JettyContextInspectorTest.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/http/JettyHTTPDestinationTest.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apach
e/cxf/transport/https/HttpsURLConnectionFactoryTest.java
   incubator/cxf/trunk/systests/pom.xml

Modified: incubator/cxf/trunk/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/j
ca/pom.xml?view=diff&rev=518627&r1=518626&r2=518627

Reply via email to