Author: asankha
Date: Mon May 7 03:44:09 2007
New Revision: 535841
URL: http://svn.apache.org/viewvc?view=rev&rev=535841
Log:
fixes for jdk 1.4 support
- move xerces and xml-apis to endorsed directory
- remove invalid method
Modified:
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java
webservices/synapse/trunk/java/src/main/assembly/bin.xml
Modified:
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java?view=diff&rev=535841&r1=535840&r2=535841
==============================================================================
---
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java
(original)
+++
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/LoggingNHttpServiceHandler.java
Mon May 7 03:44:09 2007
@@ -62,8 +62,8 @@
}
public void exception(final NHttpServerConnection conn, final IOException
ex) {
- if (ex.getMessage().contains("Connection reset") ||
- ex.getMessage().contains("forcibly closed")) {
+ if (ex.getMessage().indexOf("Connection reset") != -1 ||
+ ex.getMessage().indexOf("forcibly closed") != -1) {
this.log.warn("HTTP connection " + conn + ": " + ex.getMessage());
} else {
this.log.error("HTTP connection " + conn + ": " + ex.getMessage(),
ex);
Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=535841&r1=535840&r2=535841
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Mon May 7
03:44:09 2007
@@ -188,13 +188,6 @@
<include>synapse-nhttp-${synapse.version}.jar</include>
</includes>
</fileSet>
- <fileSet>
- <directory>src/main/release/docs</directory>
-
<outputDirectory>synapse-${synapse.version}/lib/endorsed</outputDirectory>
- <includes>
- <include>endorsed_libs.txt</include>
- </includes>
- </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
@@ -212,7 +205,16 @@
<exclude>commons-discovery:commons-discovery:jar</exclude>
<exclude>commons-io:commons-io:jar</exclude>
<exclude>org.apache.geronimo.specs:geronimo-javamail:jar</exclude>
+ <exclude>xml-apis:xml-apis:jar</exclude>
+ <exclude>xerces:xercesImpl:jar</exclude>
</excludes>
+ </dependencySet>
+ <dependencySet>
+
<outputDirectory>synapse-${synapse.version}/lib/endorsed</outputDirectory>
+ <includes>
+ <include>xml-apis:xml-apis:jar</include>
+ <include>xerces:xercesImpl:jar</include>
+ </includes>
</dependencySet>
<dependencySet>
<outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
