You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/08/22 11:56:44 UTC
svn commit: r433576 - in
/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms:
./ jca/ multiplexing/ standard/
Author: gnodet
Date: Tue Aug 22 02:56:43 2006
New Revision: 433576
URL: http://svn.apache.org/viewvc?rev=433576&view=rev
Log:
SM-403: all properties on JMS message are valid java identifiers
Use a valid java identifier for Content-Type property
Modified:
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java Tue Aug 22 02:56:43 2006
@@ -33,6 +33,8 @@
public static final String STYLE_QUEUE = "queue";
public static final String STYLE_TOPIC = "topic";
+
+ public static final String CONTENT_TYPE = "SoapContentType";
protected final transient Log log = LogFactory.getLog(getClass());
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java Tue Aug 22 02:56:43 2006
@@ -128,7 +128,7 @@
} else {
throw new IllegalArgumentException("JMS message should be a text or bytes message");
}
- String contentType = message.getStringProperty("Content-Type");
+ String contentType = message.getStringProperty(CONTENT_TYPE);
SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, contentType);
Context context = soapHelper.createContext(soap);
MessageExchange exchange = soapHelper.onReceive(context);
@@ -177,7 +177,7 @@
SoapWriter writer = soapHelper.getSoapMarshaler().createWriter(soapFault);
writer.write(baos);
response = session.createTextMessage(baos.toString());
- response.setStringProperty("Content-Type", writer.getContentType());
+ response.setStringProperty(CONTENT_TYPE, writer.getContentType());
// TODO: Copy other properties from fault
} else {
NormalizedMessage outMsg = exchange.getMessage("out");
@@ -187,7 +187,7 @@
SoapWriter writer = soapHelper.getSoapMarshaler().createWriter(out);
writer.write(baos);
response = session.createTextMessage(baos.toString());
- response.setStringProperty("Content-Type", writer.getContentType());
+ response.setStringProperty(CONTENT_TYPE, writer.getContentType());
// TODO: Copy other properties from response
}
}
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java Tue Aug 22 02:56:43 2006
@@ -110,7 +110,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
writer.write(baos);
Message msg = session.createTextMessage(baos.toString());
- msg.setStringProperty("Content-Type", writer.getContentType());
+ msg.setStringProperty(CONTENT_TYPE, writer.getContentType());
Map headers = (Map) nm.getProperty(JbiConstants.PROTOCOL_HEADERS);
if (headers != null) {
for (Iterator it = headers.keySet().iterator(); it.hasNext();) {
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java Tue Aug 22 02:56:43 2006
@@ -114,7 +114,7 @@
} else {
throw new IllegalArgumentException("JMS message should be a text or bytes message");
}
- String contentType = message.getStringProperty("Content-Type");
+ String contentType = message.getStringProperty(CONTENT_TYPE);
SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, contentType);
Context context = soapHelper.createContext(soap);
MessageExchange exchange = soapHelper.onReceive(context);
@@ -154,7 +154,7 @@
SoapWriter writer = soapHelper.getSoapMarshaler().createWriter(soapFault);
writer.write(baos);
response = session.createTextMessage(baos.toString());
- response.setStringProperty("Content-Type", writer.getContentType());
+ response.setStringProperty(CONTENT_TYPE, writer.getContentType());
// TODO: Copy other properties from fault
} else {
NormalizedMessage outMsg = exchange.getMessage("out");
@@ -164,7 +164,7 @@
SoapWriter writer = soapHelper.getSoapMarshaler().createWriter(out);
writer.write(baos);
response = session.createTextMessage(baos.toString());
- response.setStringProperty("Content-Type", writer.getContentType());
+ response.setStringProperty(CONTENT_TYPE, writer.getContentType());
// TODO: Copy other properties from response
}
}
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java Tue Aug 22 02:56:43 2006
@@ -139,7 +139,7 @@
} else {
throw new IllegalArgumentException("JMS message should be a text or bytes message");
}
- String contentType = message.getStringProperty("Content-Type");
+ String contentType = message.getStringProperty(CONTENT_TYPE);
SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, contentType);
NormalizedMessage out = exchange.createMessage();
soapHelper.getJBIMarshaler().toNMS(out, soap);
@@ -179,7 +179,7 @@
}
// overwrite whatever content-type was passed on to us with the one
// the SoapWriter constructed
- msg.setStringProperty("Content-Type", writer.getContentType());
+ msg.setStringProperty(CONTENT_TYPE, writer.getContentType());
if (exchange instanceof InOnly || exchange instanceof RobustInOnly) {
synchronized (producer) {
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java Tue Aug 22 02:56:43 2006
@@ -139,7 +139,7 @@
} else {
throw new IllegalArgumentException("JMS message should be a text or bytes message");
}
- String contentType = message.getStringProperty("Content-Type");
+ String contentType = message.getStringProperty(CONTENT_TYPE);
SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, contentType);
Context context = soapHelper.createContext(soap);
MessageExchange exchange = soapHelper.onReceive(context);
@@ -166,7 +166,7 @@
SoapWriter writer = soapHelper.getSoapMarshaler().createWriter(soapFault);
writer.write(baos);
response = session.createTextMessage(baos.toString());
- response.setStringProperty("Content-Type", writer.getContentType());
+ response.setStringProperty(CONTENT_TYPE, writer.getContentType());
// TODO: Copy other properties from fault
} else {
NormalizedMessage outMsg = exchange.getMessage("out");
@@ -176,7 +176,7 @@
SoapWriter writer = soapHelper.getSoapMarshaler().createWriter(out);
writer.write(baos);
response = session.createTextMessage(baos.toString());
- response.setStringProperty("Content-Type", writer.getContentType());
+ response.setStringProperty(CONTENT_TYPE, writer.getContentType());
// TODO: Copy other properties from response
}
}
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java?rev=433576&r1=433575&r2=433576&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java Tue Aug 22 02:56:43 2006
@@ -116,7 +116,7 @@
}
// overwrite whatever content-type was passed on to us with the one
// the SoapWriter constructed
- msg.setStringProperty("Content-Type", writer.getContentType());
+ msg.setStringProperty(CONTENT_TYPE, writer.getContentType());
if (exchange instanceof InOnly || exchange instanceof RobustInOnly) {
producer.send(msg);
@@ -150,7 +150,7 @@
} else {
throw new IllegalArgumentException("JMS message should be a text or bytes message");
}
- String contentType = message.getStringProperty("Content-Type");
+ String contentType = message.getStringProperty(CONTENT_TYPE);
SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, contentType);
NormalizedMessage out = exchange.createMessage();
soapHelper.getJBIMarshaler().toNMS(out, soap);