svn commit: r1182813 - in /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema: template/ADBBeanTemplate-bean.xsl template/ADBBeanTemplate-helpermode.xsl writer/JavaBeanWriter.j

2011-10-13 Thread amilas 
Author: amilas
Date: Thu Oct 13 12:48:47 2011
New Revision: 1182813

URL: http://svn.apache.org/viewvc?rev=1182813&view=rev
Log:
applying the patch for AXIS2-5159

Modified:

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1182813&r1=1182812&r2=1182813&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
 Thu Oct 13 12:48:47 2011
@@ -450,6 +450,18 @@

 

+
+if (  ( <= 
java.lang.String.valueOf(param).length())
+&&  (java.lang.String.valueOf(param).length() <= 
) 
+&&  
(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(param).matches(""))  ) {
+
+this.=param;
+
+}
+else {
+throw new 
java.lang.RuntimeException();
+}
+
 
 if 
(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(param).matches("")) {
 this.=param;

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=1182813&r1=1182812&r2=1182813&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
 Thu Oct 13 12:48:47 2011
@@ -438,6 +438,18 @@

 

+   
+if (  ( <= 
java.lang.String.valueOf(param).length())
+&&  (java.lang.String.valueOf(param).length() <= 
) 
+&&  
(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(param).matches(""))  ) {
+
+this.=param;
+
+}
+else {
+throw new 
java.lang.RuntimeException();
+}
+
 
 if ( param.matches( "" )) {
 this.=param;

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?rev=1182813&r1=1182812&r2=1182813&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
 Thu Oct 13 12:48:47 2011
@@ -1025,6 +1025,20 @@ public class JavaBeanWriter implements B
 
 if (metainf.isRestrictionBaseType(name) && metainf.getPatternFacet() 
!= null) {
 XSLTUtils.addAttribute(model, "patternFacet", 
metainf.getPatternFacet(), property);
+/*
+  if restriction use either maxLenFacet or minLenFacet then

svn commit: r1182956 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java

2011-10-13 Thread sagara 
Author: sagara
Date: Thu Oct 13 16:25:23 2011
New Revision: 1182956

URL: http://svn.apache.org/viewvc?rev=1182956&view=rev
Log:
AXIS2-3933 :
CommonsHTTPTransportSender should not use AxisHttpResponseImpl in conditions 
instead AxisHttpResponse interface should use to identify implementation 
classes.
Removed format.setAutoCloseWriter(true) based on Axiom r804020 
http://svn.apache.org/viewvc?view=revision&revision=804020.

Modified:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=1182956&r1=1182955&r2=1182956&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
 Thu Oct 13 16:25:23 2011
@@ -32,7 +32,7 @@ import org.apache.axis2.transport.Messag
 import org.apache.axis2.transport.OutTransportInfo;
 import org.apache.axis2.transport.TransportSender;
 import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.server.AxisHttpResponseImpl;
+import org.apache.axis2.transport.http.server.AxisHttpResponse;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpException;
@@ -309,7 +309,7 @@ public class CommonsHTTPTransportSender 
 }
 }
 }
-} else if (transportInfo instanceof AxisHttpResponseImpl) {
+} else if (transportInfo instanceof AxisHttpResponse) {
 Object customHeaders = 
msgContext.getProperty(HTTPConstants.HTTP_HEADERS);
 if (customHeaders != null) {
 if (customHeaders instanceof List) {
@@ -317,7 +317,7 @@ public class CommonsHTTPTransportSender 
 while (iter.hasNext()) {
 Header header = (Header) iter.next();
 if (header != null) {
-((AxisHttpResponseImpl) transportInfo)
+((AxisHttpResponse) transportInfo)
 .addHeader(header.getName(), 
header.getValue());
 }
 }
@@ -326,7 +326,7 @@ public class CommonsHTTPTransportSender 
 while (iter.hasNext()) {
 Map.Entry header = (Map.Entry) iter.next();
 if (header != null) {
-((AxisHttpResponseImpl) transportInfo)
+((AxisHttpResponse) transportInfo)
 .addHeader((String) header.getKey(), 
(String) header.getValue());
 }
 }
@@ -334,8 +334,6 @@ public class CommonsHTTPTransportSender 
 }
 }
 
-format.setAutoCloseWriter(true);
-
 MessageFormatter messageFormatter = 
TransportUtils.getMessageFormatter(msgContext);
 if (messageFormatter == null) throw new AxisFault("No MessageFormatter 
in MessageContext");