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

2012-03-30 Thread sagara 
Author: sagara
Date: Fri Mar 30 13:38:34 2012
New Revision: 1307410

URL: http://svn.apache.org/viewvc?rev=1307410&view=rev
Log:
Applied patch for AXIS2-5275.

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=1307410&r1=1307409&r2=1307410&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
 Fri Mar 30 13:38:34 2012
@@ -590,7 +590,7 @@ public class ConverterUtil {
 if (restpart.startsWith("Z")) {
 // this is a gmt time zone value
 timeZoneOffSet = 0;
-} else if (restpart.startsWith("+") || 
restpart.startsWith("-")) {
+} else if (restpart.startsWith("+") || 
restpart.startsWith("-") || restpart.startsWith("T")) {
 // this is a specific time format string
 if (restpart.charAt(3) != ':'){
 throw new RuntimeException("invalid time zone format 
(" + source

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=1307410&r1=1307409&r2=1307410&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
 Fri Mar 30 13:38:34 2012
@@ -162,6 +162,17 @@ public class ConverterUtilTest extends T
 System.out.println("String   ==> " + "2007-02-15-12:30");
 System.out.println("calendar ==> " + simpleDateFormat.format(date));
 System.out.println("calendar ==> " + 
ConverterUtil.convertToString(date));
+
+//Included two new tests from here http://www.w3.org/TR/NOTE-datetime
+date = ConverterUtil.convertToDate("2011-11-05T08:15:30-05:00");
+System.out.println("String   ==> " + "2011-11-05T08:15:30-05:00");
+System.out.println("calendar ==> " + simpleDateFormat.format(date));
+System.out.println("calendar ==> " + 
ConverterUtil.convertToString(date));
+
+date = ConverterUtil.convertToDate("1994-11-05T13:15:30Z");
+System.out.println("String   ==> " + "1994-11-05T13:15:30Z");
+System.out.println("calendar ==> " + simpleDateFormat.format(date));
+System.out.println("calendar ==> " + 
ConverterUtil.convertToString(date));
 
 }

svn commit: r1307411 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/ kernel/src/org/apache/axis2/classloader/ kernel/src/org/apache/axis2/util/ tool/axis2-eclipse-codegen-plugin

2012-03-30 Thread sagara 
Author: sagara
Date: Fri Mar 30 13:40:27 2012
New Revision: 1307411

URL: http://svn.apache.org/viewvc?rev=1307411&view=rev
Log:
Applied patch for AXIS2-4978.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java

axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java

axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java

axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java

axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java 
(original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java 
Fri Mar 30 13:40:27 2012
@@ -471,6 +471,12 @@ public class Constants extends org.apach
  */
 
 public static final String 
ENABLE_CHILD_FIRST_CLASS_LOADING="EnableChildFirstClassLoading";
+
+/**
+ * Specify buffer size to used in various data copy operations.
+ */
+public static final String DATA_BUFFER_SIZE="DataBufferSize";
+public static final int DEFAULT_DATA_BUFFER_SIZE=2048;
 
 }
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
 Fri Mar 30 13:40:27 2012
@@ -24,6 +24,8 @@ import java.io.Reader;
 import java.io.Writer;
 import java.util.jar.JarFile;
 
+import org.apache.axis2.Constants;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -33,7 +35,7 @@ public final class IoUtil {
 
 public static byte[] getBytes(InputStream inputStream) throws IOException {
 try {
-byte[] buffer = new byte[4096];
+byte[] buffer = new 
byte[2*Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
 ByteArrayOutputStream out = new ByteArrayOutputStream();
 for (int count = inputStream.read(buffer); count >= 0; count = 
inputStream.read(buffer)) {
 out.write(buffer, 0, count);

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
 Fri Mar 30 13:40:27 2012
@@ -30,6 +30,8 @@ import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 import java.util.zip.ZipException;
 
+import org.apache.axis2.Constants;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -48,7 +50,7 @@ public class JarResourceLocation extends
 try {
 is = new FileInputStream(cacheFile);
 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-byte[] buffer = new byte[2048];
+byte[] buffer = new 
byte[Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
 int bytesRead = -1;
 while ((bytesRead = is.read(buffer)) != -1) {
 baos.write(buffer, 0, bytesRead);

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/k

svn commit: r1307420 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtil

2012-03-30 Thread sagara 
Author: sagara
Date: Fri Mar 30 13:47:35 2012
New Revision: 1307420

URL: http://svn.apache.org/viewvc?rev=1307420&view=rev
Log:
AXIS2-5275 - Merged r1307410  to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

Propchange: axis/axis2/java/core/branches/1_6/
--
  Merged /axis/axis2/java/core/trunk:r1307410

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1307420&r1=1307419&r2=1307420&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Fri Mar 30 13:47:35 2012
@@ -587,7 +587,7 @@ public class ConverterUtil {
 if (restpart.startsWith("Z")) {
 // this is a gmt time zone value
 timeZoneOffSet = 0;
-} else if (restpart.startsWith("+") || 
restpart.startsWith("-")) {
+} else if (restpart.startsWith("+") || 
restpart.startsWith("-") || restpart.startsWith("T")) {
 // this is a specific time format string
 if (restpart.charAt(3) != ':'){
 throw new RuntimeException("invalid time zone format 
(" + source

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1307420&r1=1307419&r2=1307420&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 Fri Mar 30 13:47:35 2012
@@ -162,6 +162,17 @@ public class ConverterUtilTest extends T
 System.out.println("String   ==> " + "2007-02-15-12:30");
 System.out.println("calendar ==> " + simpleDateFormat.format(date));
 System.out.println("calendar ==> " + 
ConverterUtil.convertToString(date));
+
+//Included two new tests from here http://www.w3.org/TR/NOTE-datetime
+date = ConverterUtil.convertToDate("2011-11-05T08:15:30-05:00");
+System.out.println("String   ==> " + "2011-11-05T08:15:30-05:00");
+System.out.println("calendar ==> " + simpleDateFormat.format(date));
+System.out.println("calendar ==> " + 
ConverterUtil.convertToString(date));
+
+date = ConverterUtil.convertToDate("1994-11-05T13:15:30Z");
+System.out.println("String   ==> " + "1994-11-05T13:15:30Z");
+System.out.println("calendar ==> " + simpleDateFormat.format(date));
+System.out.println("calendar ==> " + 
ConverterUtil.convertToString(date));
 
 }