svn commit: r1185366 - in /axis/axis2/java/core/branches/1_6: ./ modules/fastinfoset/ modules/integration/ modules/jaxws/src/org/apache/axis2/datasource/jaxb/ modules/jaxws/src/org/apache/axis2/jaxws/

2011-10-17 Thread veithen 
Author: veithen
Date: Mon Oct 17 20:47:17 2011
New Revision: 1185366

URL: http://svn.apache.org/viewvc?rev=1185366&view=rev
Log:
AXIS2-4902: Merged r1184808, r1184810 and r1184816 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)
axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/1_6/modules/integration/itest-build.xml

axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java

axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java

axis/axis2/java/core/branches/1_6/modules/json/src/org/apache/axis2/json/AbstractJSONDataSource.java

axis/axis2/java/core/branches/1_6/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java

axis/axis2/java/core/branches/1_6/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java

axis/axis2/java/core/branches/1_6/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java
axis/axis2/java/core/branches/1_6/modules/kernel/pom.xml

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 20:47:17 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618,1184808,1184810,1184816

Modified: axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml?rev=1185366&r1=1185365&r2=1185366&view=diff
==
--- axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/fastinfoset/pom.xml Mon Oct 17 
20:47:17 2011
@@ -202,7 +202,7 @@
 
 
 
-
+
 
 
 

Modified: axis/axis2/java/core/branches/1_6/modules/integration/itest-build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/itest-build.xml?rev=1185366&r1=1185365&r2=1185366&view=diff
==
--- axis/axis2/java/core/branches/1_6/modules/integration/itest-build.xml 
(original)
+++ axis/axis2/java/core/branches/1_6/modules/integration/itest-build.xml Mon 
Oct 17 20:47:17 2011
@@ -29,7 +29,7 @@



-   
+   




Modified: 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java?rev=1185366&r1=1185365&r2=1185366&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/datasource/jaxb/J

svn commit: r1185389 - /axis/axis2/java/core/branches/1_6/modules/parent/pom.xml

2011-10-17 Thread veithen 
Author: veithen
Date: Mon Oct 17 21:47:22 2011
New Revision: 1185389

URL: http://svn.apache.org/viewvc?rev=1185389&view=rev
Log:
Upgraded to Neethi 3.0.2-SNAPSHOT. This should (partially) solve AXIS2-5145.

Modified:
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml

Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1185389&r1=1185388&r2=1185389&view=diff
==
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Mon Oct 17 
21:47:22 2011
@@ -66,7 +66,8 @@
 http://issues.apache.org/jira/browse/AXIS2
 
 
-3.0.1
+
+3.0.2-SNAPSHOT
 1.0M9
 
 1.2.13-SNAPSHOT

svn commit: r1185504 - in /axis/axis2/java/core/trunk/modules/adb: src/org/apache/axis2/databinding/utils/ConverterUtil.java test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

2011-10-17 Thread sagara 
Author: sagara
Date: Tue Oct 18 06:54:07 2011
New Revision: 1185504

URL: http://svn.apache.org/viewvc?rev=1185504&view=rev
Log:
Fixed AXIS2-5167 and added a test case for getStringFromDatahandler() method.

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1185504&r1=1185503&r2=1185504&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Tue Oct 18 06:54:07 2011
@@ -1360,18 +1360,27 @@ public class ConverterUtil {
  *
  * @return string
  */
-public static String getStringFromDatahandler(DataHandler dataHandler) {
-try {
-InputStream inStream;
-if (dataHandler == null) {
-return "";
-}
-inStream = dataHandler.getDataSource().getInputStream();
-byte[] data = IOUtils.getStreamAsByteArray(inStream);
-return Base64.encode(data);
-} catch (Exception e) {
-throw new RuntimeException(e);
-}
+   public static String getStringFromDatahandler(DataHandler dataHandler) {
+   InputStream inStream = null;
+   try {
+   if (dataHandler == null) {
+   return "";
+   }
+   inStream = dataHandler.getDataSource().getInputStream();
+   byte[] data = IOUtils.getStreamAsByteArray(inStream);
+   return Base64.encode(data);
+   } catch (Exception e) {
+   throw new RuntimeException(e);
+
+   } finally {
+   try {
+   if (inStream != null)
+   inStream.close();
+   } catch (IOException e) {
+   e.printStackTrace();
+   }
+
+   }
 }
 
 /**

Modified: 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1185504&r1=1185503&r2=1185504&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 Tue Oct 18 06:54:07 2011
@@ -29,6 +29,12 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+
+import org.apache.axiom.attachments.ByteArrayDataSource;
+import org.apache.axiom.om.util.Base64;
+
 public class ConverterUtilTest extends TestCase {
 
 /** Test conversion of Big Integer */
@@ -207,5 +213,13 @@ public class ConverterUtilTest extends T
 assertNotNull(date);
 
 }
-
+
+   public void testConvertToStringFromDataHandler() {
+   String inStr = "Sample Data";
+   DataSource ds = new ByteArrayDataSource(inStr.getBytes());
+   DataHandler dh = new DataHandler(ds);
+   String rawOutStr = ConverterUtil.convertToString(dh);
+   String outStr = new String(Base64.decode(rawOutStr));
+   assertEquals("Not expected content", inStr, outStr);
+   }
 }