You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ol...@apache.org on 2008/06/10 20:23:50 UTC
svn commit: r666256 - in /synapse/trunk/java:
modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/Utils.java
pom.xml
Author: olegk
Date: Tue Jun 10 11:23:49 2008
New Revision: 666256
URL: http://svn.apache.org/viewvc?rev=666256&view=rev
Log:
SYNAPSE-353: eliminated direct dependency on Commons Lang
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/Utils.java
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java?rev=666256&r1=666255&r2=666256&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java Tue Jun 10 11:23:49 2008
@@ -32,7 +32,6 @@
import org.apache.synapse.format.PlainTextFormatter;
import org.apache.synapse.transport.vfs.PollTableEntry;
import org.apache.axis2.context.MessageContext;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.axiom.soap.*;
@@ -267,8 +266,8 @@
builder == null ? null :
builder.getDocument() == null ? null : builder.getDocument().getCharsetEncoding();
- if (StringUtils.isNotBlank(charEncOfMessage) &&
- StringUtils.isNotBlank(charSetEnc) &&
+ if (!isBlank(charEncOfMessage) &&
+ !isBlank(charSetEnc) &&
!charEncOfMessage.equalsIgnoreCase(charSetEnc)) {
handleException("Charset encoding of transport differs from that of the payload");
}
@@ -390,6 +389,18 @@
return (str != null && str.trim().length() > 0);
}
+ public static boolean isBlank(String str) {
+ if (str == null || str.length() == 0) {
+ return true;
+ }
+ for (int i = 0; i < str.length(); i++) {
+ if (!Character.isWhitespace(str.charAt(i))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public static boolean isUsingTransport(AxisService service, String transportName) {
boolean process = service.isEnableAllTransports();
if (process) {
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/Utils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/Utils.java?rev=666256&r1=666255&r2=666256&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/Utils.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/Utils.java Tue Jun 10 11:23:49 2008
@@ -18,8 +18,6 @@
*/
package org.apache.synapse.transport.base.datagram;
-import org.apache.commons.lang.StringUtils;
-
/**
* Utility class with methods used by datagram transports.
*/
@@ -31,7 +29,11 @@
for (int i=0; i<16; i++) {
int index = start+i;
if (index < length) {
- buffer.append(StringUtils.leftPad(Integer.toHexString(data[start+i]), 2, '0'));
+ String hex = Integer.toHexString(data[start+i]);
+ if (hex.length() < 2) {
+ buffer.append('0');
+ }
+ buffer.append(hex);
} else {
buffer.append(" ");
}
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=666256&r1=666255&r2=666256&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Tue Jun 10 11:23:49 2008
@@ -229,10 +229,6 @@
<version>${axis2.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-niossl</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>