svn commit: r1026575 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/engine/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern

2010-10-23 Thread veithen 
Author: veithen
Date: Sat Oct 23 08:32:05 2010
New Revision: 1026575

URL: http://svn.apache.org/viewvc?rev=1026575&view=rev
Log:
AXIS2-4280: Merged r817965 to the 1.5 branch as requested by Kim Damevin.

Modified:
axis/axis2/java/core/branches/1_5/   (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/1_5/modules/parent/   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml   
(props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/   (props 
changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
   (props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/local/   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 23 08:32:05 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452
-/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 23 08:32:05 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,7

svn commit: r1026658 - in /axis/axis2/java/transports/trunk/modules: base/ base/src/main/java/org/apache/axis2/format/ base/src/main/java/org/apache/axis2/transport/base/streams/ jms/src/main/java/org

2010-10-23 Thread veithen 
Author: veithen
Date: Sat Oct 23 18:16:45 2010
New Revision: 1026658

URL: http://svn.apache.org/viewvc?rev=1026658&view=rev
Log:
Upgraded to commons-io 2.0 and removed classes that are now part of commons-io 
(see IO-158).

Removed:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/streams/
Modified:
axis/axis2/java/transports/trunk/modules/base/pom.xml

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java

axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java

axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java

Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=1026658&r1=1026657&r2=1026658&view=diff
==
--- axis/axis2/java/transports/trunk/modules/base/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/base/pom.xml Sat Oct 23 18:16:45 
2010
@@ -85,7 +85,7 @@
 
 commons-io
 commons-io
-1.4
+2.0
 
 
 

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java?rev=1026658&r1=1026657&r2=1026658&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
 Sat Oct 23 18:16:45 2010
@@ -26,7 +26,7 @@ import javax.activation.DataSource;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axis2.transport.base.streams.ReaderInputStream;
+import org.apache.commons.io.input.ReaderInputStream;
 
 /**
  * Data source that represents the text of a given {...@link OMElement}.

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java?rev=1026658&r1=1026657&r2=1026658&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextMessageBuilderAdapter.java
 Sat Oct 23 18:16:45 2010
@@ -31,7 +31,7 @@ import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.builder.Builder;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.base.streams.ReaderInputStream;
+import org.apache.commons.io.input.ReaderInputStream;
 
 /**
  * Adapter to add the {...@link TextMessageBuilder} interface to an

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=1026658&r1=1026657&r2=1026658&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
 Sat Oct 23 18:16:45 2010
@@ -28,9 +28,9 @@ import org.apache.axis2.transport.Transp
 import org.apache.axis2.transport.MessageFormatter;
 import org.apache.axis2.transport.OutTransportInfo;
 import org.apache.axis2.transport.base.*;
-import org.apache.axis2.transport.base.streams.WriterOutputStream;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.jms.iowrappers.BytesMessageOutputStream;
+import org.apache.commons.io.output.WriterOutputStream;
 
 import javax.jms.*;
 import javax.activation.DataHandler;

Modified: 
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java?rev=1026658&r1=1026657&r2=1026658&view=diff
===