Author: ffang
Date: Fri Dec 17 07:50:34 2010
New Revision: 1050299
URL: http://svn.apache.org/viewvc?rev=1050299&view=rev
Log:
Merged revisions 1050282-1050284 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1050282 | ffang | 2010-12-17 14:12:21 +0800 (五, 17 12 2010) | 1 line
[CXF-3179]bigger waiting time to avoid test failure with busy machine
........
r1050284 | ffang | 2010-12-17 14:37:59 +0800 (五, 17 12 2010) | 1 line
[CXF-3174]support gzip encoding compliant with Soap over JMS spec
........
Added:
cxf/branches/2.3.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/GzipServer.java
- copied unchanged from r1050284,
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/GzipServer.java
cxf/branches/2.3.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
- copied unchanged from r1050284,
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
cxf/branches/2.3.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/gzipBus.xml
- copied unchanged from r1050284,
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/gzipBus.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
Fri Dec 17 07:50:34 2010
@@ -43,6 +43,14 @@ public final class JMSFaultFactory {
return createFault(SoapJMSConstants.getContentTypeMismatchQName(), m);
}
+ public static JMSFault createContentEncodingNotSupported(String
contentEncoding) {
+ String m = new
org.apache.cxf.common.i18n.Message("CONTENT_ENCODING_NOT_SUPPORTED", LOG,
+ new Object[] {
+ contentEncoding
+ }).toString();
+ return createFault(SoapJMSConstants.getContentTypeMismatchQName(), m);
+ }
+
public static JMSFault createMalformedRequestURIFault(String requestURI) {
String m = new
org.apache.cxf.common.i18n.Message("MALFORMED_REQUESTURI", LOG,
new Object[] {
Modified:
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
Fri Dec 17 07:50:34 2010
@@ -37,6 +37,7 @@ public final class SoapJMSConstants {
public static final String SOAPACTION_PARAMETER_NAME = "soapAction";
public static final String TARGETSERVICE_PARAMETER_NAME = "targetService";
public static final String CONTENTTYPE_PARAMETER_NAME = "contentType";
+ public static final String CONTENTENCODING_PARAMETER_NAME =
"contentEncoding";
public static final String ISFAULT_PARAMETER_NAME = "isFault";
// JMS Field name
@@ -46,6 +47,7 @@ public final class SoapJMSConstants {
public static final String SOAPACTION_FIELD = SOAP_JMS_PREFIX +
SOAPACTION_PARAMETER_NAME;
public static final String TARGETSERVICE_FIELD = SOAP_JMS_PREFIX +
TARGETSERVICE_PARAMETER_NAME;
public static final String CONTENTTYPE_FIELD = SOAP_JMS_PREFIX +
CONTENTTYPE_PARAMETER_NAME;
+ public static final String CONTENTENCODING_FIELD = SOAP_JMS_PREFIX +
CONTENTENCODING_PARAMETER_NAME;
public static final String ISFAULT_FIELD = SOAP_JMS_PREFIX +
ISFAULT_PARAMETER_NAME;
public static final String SOAP_JMS_SPECIFICIATION_TRANSPORTID =
"http://www.w3.org/2010/soapjms/";;
@@ -53,6 +55,7 @@ public final class SoapJMSConstants {
// fault codes
private static final String JMS_CONTENTTYPEMISMATCH_FAULT_CODE =
"contentTypeMismatch";
+ private static final String JMS_CONTENTENCODINGNOTSUPPORTED_FAULT_CODE =
"contentEncodingNotSupported";
private static final String JMS_MALFORMEDREQUESTURI_FAULT_CODE =
"malformedRequestURI";
private static final String JMS_MISMATCHEDSOAPACTION_FAULT_CODE =
"mismatchedSoapAction";
private static final String JMS_MISSINGCONTENTTYPE_FAULT_CODE =
"missingContentType";
@@ -68,6 +71,10 @@ public final class SoapJMSConstants {
public static QName getContentTypeMismatchQName() {
return new QName(SOAP_JMS_NAMESPACE,
JMS_CONTENTTYPEMISMATCH_FAULT_CODE);
}
+
+ public static QName getContentEncodingNotSupportedQName() {
+ return new QName(SOAP_JMS_NAMESPACE,
JMS_CONTENTENCODINGNOTSUPPORTED_FAULT_CODE);
+ }
public static QName getMalformedRequestURIQName() {
return new QName(SOAP_JMS_NAMESPACE,
JMS_MALFORMEDREQUESTURI_FAULT_CODE);
Modified:
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
Fri Dec 17 07:50:34 2010
@@ -47,6 +47,7 @@ public class SoapJMSInInterceptor extend
.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
checkContentType(message, headers);
+ checkContentEncoding(message, headers);
checkRequestURI(message, headers);
checkSoapAction(message, headers);
checkBindingVersion(message, headers);
@@ -58,6 +59,28 @@ public class SoapJMSInInterceptor extend
* @param message
* @param headers
*/
+ private void checkContentEncoding(SoapMessage message, Map<String,
List<String>> headers) {
+ List<String> contentEncodingList =
headers.get(SoapJMSConstants.CONTENTENCODING_FIELD);
+ JMSFault jmsFault = null;
+ if (contentEncodingList != null && contentEncodingList.size() > 0) {
+ String contentEncoding = contentEncodingList.get(0);
+ if (!"gzip".equals(contentEncoding)) {
+ jmsFault =
JMSFaultFactory.createContentEncodingNotSupported(contentEncoding);
+ }
+ }
+ if (jmsFault != null) {
+ Fault f = createFault(message, jmsFault);
+ if (f != null) {
+ throw f;
+ }
+ }
+ }
+
+
+ /**
+ * @param message
+ * @param headers
+ */
private void checkJMSMessageFormat(SoapMessage message, Map<String,
List<String>> headers) {
List<String> mt = headers.get(SoapJMSConstants.JMS_MESSAGE_TYPE);
if (mt != null && mt.size() > 0) {
Modified:
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
Fri Dec 17 07:50:34 2010
@@ -68,7 +68,6 @@ public class GZIPFeature extends Abstrac
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
provider.getInInterceptors().add(IN);
- provider.getInFaultInterceptors().add(IN);
if (threshold == -1) {
provider.getOutInterceptors().add(OUT);
provider.getOutFaultInterceptors().add(OUT);
Modified:
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
Fri Dec 17 07:50:34 2010
@@ -68,6 +68,9 @@ public class GZIPInInterceptor extends A
if (protocolHeaders != null) {
List<String> contentEncoding =
HttpHeaderHelper.getHeader(protocolHeaders,
HttpHeaderHelper.CONTENT_ENCODING);
+ if (contentEncoding == null) {
+ contentEncoding =
protocolHeaders.get(GZIPOutInterceptor.SOAP_JMS_CONTENTENCODING);
+ }
if (contentEncoding != null
&& (contentEncoding.contains("gzip") ||
contentEncoding.contains("x-gzip"))) {
try {
Modified:
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
Fri Dec 17 07:50:34 2010
@@ -89,6 +89,8 @@ public class GZIPOutInterceptor extends
* given by the client in Accept-Encoding.
*/
public static final String GZIP_ENCODING_KEY =
GZIPOutInterceptor.class.getName() + ".gzipEncoding";
+
+ public static final String SOAP_JMS_CONTENTENCODING =
"SOAPJMS_contentEncoding";
private static final ResourceBundle BUNDLE =
BundleUtils.getBundle(GZIPOutInterceptor.class);
private static final Logger LOG =
LogUtils.getL7dLogger(GZIPOutInterceptor.class);
@@ -165,6 +167,11 @@ public class GZIPOutInterceptor extends
if (requestHeaders != null) {
List<String> acceptEncodingHeader =
CastUtils.cast(HttpHeaderHelper
.getHeader(requestHeaders,
HttpHeaderHelper.ACCEPT_ENCODING));
+ List<String> jmsEncodingHeader =
CastUtils.cast(requestHeaders.get(SOAP_JMS_CONTENTENCODING));
+ if (jmsEncodingHeader != null &&
jmsEncodingHeader.contains("gzip")) {
+ permitted = UseGzip.YES;
+ message.put(GZIP_ENCODING_KEY, "gzip");
+ }
if (acceptEncodingHeader != null) {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Accept-Encoding header: " +
acceptEncodingHeader);
Modified:
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Fri Dec 17 07:50:34 2010
@@ -48,6 +48,7 @@ import org.apache.cxf.common.util.SOAPCo
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.security.SecurityContext;
+import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
import org.apache.cxf.transport.jms.uri.JMSEndpoint;
import org.apache.cxf.transport.jms.uri.JMSEndpointParser;
@@ -245,6 +246,10 @@ public final class JMSUtils {
messageProperties.setSOAPJMSContentType(jmsMessage
.getStringProperty(JMSSpecConstants.CONTENTTYPE_FIELD));
}
+ if
(jmsMessage.propertyExists(JMSSpecConstants.CONTENTENCODING_FIELD)) {
+ messageProperties.setSOAPJMSContentEncoding(jmsMessage
+
.getStringProperty(JMSSpecConstants.CONTENTENCODING_FIELD));
+ }
if (jmsMessage.propertyExists(JMSSpecConstants.SOAPACTION_FIELD)) {
messageProperties.setSOAPJMSSOAPAction(jmsMessage
.getStringProperty(JMSSpecConstants.SOAPACTION_FIELD));
@@ -281,6 +286,8 @@ public final class JMSUtils {
// set the message encoding
inMessage.put(org.apache.cxf.message.Message.ENCODING,
getEncoding(contentType));
}
+
+
} catch (JMSException ex) {
throw JmsUtils.convertJmsAccessException(ex);
}
@@ -437,6 +444,10 @@ public final class JMSUtils {
}
return contentType;
}
+
+ public static String getContentEncoding(org.apache.cxf.message.Message
message) {
+ return (String)message.get(GZIPOutInterceptor.GZIP_ENCODING_KEY);
+ }
public static Message buildJMSMessageFromCXFMessage(JMSConfiguration
jmsConfig,
org.apache.cxf.message.Message outMessage,
@@ -510,6 +521,11 @@ public final class JMSUtils {
jmsMessage.setStringProperty(JMSSpecConstants.CONTENTTYPE_FIELD,
messageProperties
.getSOAPJMSContentType());
}
+
+ if (messageProperties.isSetSOAPJMSContentEncoding()) {
+
jmsMessage.setStringProperty(JMSSpecConstants.CONTENTENCODING_FIELD,
messageProperties
+ .getSOAPJMSContentEncoding());
+ }
if (messageProperties.isSetSOAPJMSSOAPAction()) {
jmsMessage.setStringProperty(JMSSpecConstants.SOAPACTION_FIELD,
messageProperties
@@ -583,6 +599,9 @@ public final class JMSUtils {
messageProperties.setSOAPJMSBindingVersion("1.0");
}
messageProperties.setSOAPJMSContentType(getContentType(outMessage));
+ if (getContentEncoding(outMessage) != null) {
+
messageProperties.setSOAPJMSContentEncoding(getContentEncoding(outMessage));
+ }
String soapAction = null;
// Retrieve or create protocol headers
Map<String, List<String>> headers = CastUtils.cast((Map<?,
?>)outMessage
Modified:
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
Fri Dec 17 07:50:34 2010
@@ -55,6 +55,7 @@ public final class JMSSpecConstants {
public static final String SOAPACTION_PARAMETER_NAME = "soapAction";
public static final String TARGETSERVICE_PARAMETER_NAME = "targetService";
public static final String CONTENTTYPE_PARAMETER_NAME = "contentType";
+ public static final String CONTENTENCODING_PARAMETER_NAME =
"contentEncoding";
public static final String ISFAULT_PARAMETER_NAME = "isFault";
// JMS Field name
@@ -64,6 +65,7 @@ public final class JMSSpecConstants {
public static final String SOAPACTION_FIELD = SOAP_JMS_PREFIX +
SOAPACTION_PARAMETER_NAME;
public static final String TARGETSERVICE_FIELD = SOAP_JMS_PREFIX +
TARGETSERVICE_PARAMETER_NAME;
public static final String CONTENTTYPE_FIELD = SOAP_JMS_PREFIX +
CONTENTTYPE_PARAMETER_NAME;
+ public static final String CONTENTENCODING_FIELD = SOAP_JMS_PREFIX +
CONTENTENCODING_PARAMETER_NAME;
public static final String ISFAULT_FIELD = SOAP_JMS_PREFIX +
ISFAULT_PARAMETER_NAME;
//
Modified:
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Fri Dec 17 07:50:34 2010
@@ -104,6 +104,7 @@
<xs:attribute name="SOAPJMSTargetService" type="xs:string"/>
<xs:attribute name="SOAPJMSBindingVersion" type="xs:string"/>
<xs:attribute name="SOAPJMSContentType" type="xs:string"/>
+ <xs:attribute name="SOAPJMSContentEncoding" type="xs:string"/>
<xs:attribute name="SOAPJMSSOAPAction" type="xs:anyURI"/>
<xs:attribute name="SOAPJMSIsFault" type="pt:ParameterizedBoolean"/>
<xs:attribute name="SOAPJMSRequestURI" type="xs:string"/>
Modified:
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=1050299&r1=1050298&r2=1050299&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
Fri Dec 17 07:50:34 2010
@@ -156,8 +156,7 @@ public class ServerPersistenceTest exten
out.getOutboundMessages().clear();
in.getInboundMessages().clear();
-
-
+
responses[3] = greeter.greetMeAsync("four");
verifyRetransmissionQueue();
@@ -240,7 +239,7 @@ public class ServerPersistenceTest exten
void verifyRetransmissionQueue() throws Exception {
- awaitMessages(3, 5, 40000);
+ awaitMessages(3, 5, 60000);
boolean empty =
greeterBus.getExtension(RMManager.class).getRetransmissionQueue().isEmpty();
assertTrue("Retransmission Queue is not empty", empty);
