Author: tabish
Date: Mon Aug 15 22:30:39 2011
New Revision: 1158044
URL: http://svn.apache.org/viewvc?rev=1158044&view=rev
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQ-1540
Modified:
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/package.html
Modified:
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java?rev=1158044&r1=1158043&r2=1158044&view=diff
==============================================================================
---
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java
(original)
+++
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java
Mon Aug 15 22:30:39 2011
@@ -40,6 +40,9 @@ public class CreateSubscriber extends Du
}
public void setSelector(String selector) {
+ if (selector != null) {
+ selector = selector.trim();
+ }
this.selector = selector;
}
Modified:
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java?rev=1158044&r1=1158043&r2=1158044&view=diff
==============================================================================
---
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java
(original)
+++
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java
Mon Aug 15 22:30:39 2011
@@ -31,8 +31,8 @@ import org.springframework.web.servlet.m
/**
* Sends a message
- *
- *
+ *
+ *
*/
public class SendMessage extends DestinationFacade implements Controller {
@@ -88,6 +88,9 @@ public class SendMessage extends Destina
}
public void setJMSCorrelationID(String correlationID) {
+ if (correlationID != null) {
+ correlationID = correlationID.trim();
+ }
jmsCorrelationID = correlationID;
}
@@ -96,6 +99,9 @@ public class SendMessage extends Destina
}
public void setJMSReplyTo(String replyTo) {
+ if (replyTo != null) {
+ replyTo = replyTo.trim();
+ }
jmsReplyTo = replyTo;
}
@@ -104,6 +110,9 @@ public class SendMessage extends Destina
}
public void setJMSType(String type) {
+ if (type != null) {
+ type = type.trim();
+ }
jmsType = type;
}
@@ -152,6 +161,9 @@ public class SendMessage extends Destina
}
public void setJMSMessageCountHeader(String messageCountHeader) {
+ if (messageCountHeader != null) {
+ messageCountHeader = messageCountHeader.trim();
+ }
jmsMessageCountHeader = messageCountHeader;
}
@@ -165,6 +177,7 @@ public class SendMessage extends Destina
return client.getSession().createMessage();
}
+ @SuppressWarnings("rawtypes")
protected void appendHeaders(Message message, HttpServletRequest request)
throws JMSException {
message.setJMSCorrelationID(jmsCorrelationID);
if (jmsReplyTo != null && jmsReplyTo.trim().length() > 0) {
@@ -179,7 +192,7 @@ public class SendMessage extends Destina
Map.Entry entry = (Map.Entry) iter.next();
String name = (String) entry.getKey();
if (name.equals("secret")) {
- continue;
+ continue;
}
Object value = entry.getValue();
if (isValidPropertyName(name)) {
@@ -233,8 +246,8 @@ public class SendMessage extends Destina
// allow JMSX extensions or non JMS properties
return name.startsWith("JMSX") || !name.startsWith("JMS");
}
-
- public String[] getSupportedHttpMethods() {
- return new String[]{"POST"};
- }
+
+ public String[] getSupportedHttpMethods() {
+ return new String[]{"POST"};
+ }
}
Modified:
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java?rev=1158044&r1=1158043&r2=1158044&view=diff
==============================================================================
---
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
(original)
+++
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
Mon Aug 15 22:30:39 2011
@@ -88,6 +88,9 @@ public class DestinationFacade {
}
public void setJMSDestination(String destination) {
+ if (destination != null) {
+ destination = destination.trim();
+ }
this.jmsDestination = destination;
}
Modified:
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java?rev=1158044&r1=1158043&r2=1158044&view=diff
==============================================================================
---
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java
(original)
+++
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java
Mon Aug 15 22:30:39 2011
@@ -34,6 +34,9 @@ public class DurableSubscriberFacade ext
}
public void setClientId(String clientId) {
+ if (clientId != null) {
+ clientId = clientId.trim();
+ }
this.clientId = clientId;
}
@@ -42,6 +45,9 @@ public class DurableSubscriberFacade ext
}
public void setSubscriberName(String subscriberName) {
+ if (subscriberName != null) {
+ subscriberName = subscriberName.trim();
+ }
this.subscriberName = subscriberName;
}
Modified:
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/package.html
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/package.html?rev=1158044&r1=1158043&r2=1158044&view=diff
==============================================================================
---
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/package.html
(original)
+++
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/package.html
Mon Aug 15 22:30:39 2011
@@ -21,7 +21,7 @@
<p>
Web Connectors so that messages can be sent via HTTP POST or read via
- HTTP POST or GET as well as support for web streaming to we browser or
+ HTTP POST or GET as well as support for web streaming to web browser or
JavaScript clients.
</p>
