svn commit: r1201863 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara
Date: Mon Nov 14 20:08:45 2011
New Revision: 1201863
URL: http://svn.apache.org/viewvc?rev=1201863&view=rev
Log:
Fixed AXIS2-5183.
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1201863&r1=1201862&r2=1201863&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Mon Nov 14 20:08:45 2011
@@ -917,7 +917,7 @@ public class BeanUtil {
helper, true, objectSupplier,
genericType);
valueList.add(o);
}
-if (valueList.get(0) == null) {
+if (valueList.size() == 1 && valueList.get(0) == null) {
retObjs[count] = null;
} else {
retObjs[count] = ConverterUtil.convertToArray(arrayClassType,
svn commit: r1201864 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara
Date: Mon Nov 14 20:11:42 2011
New Revision: 1201864
URL: http://svn.apache.org/viewvc?rev=1201864&view=rev
Log:
Merged r1201863 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/BeanUtil.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 20:11:42 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,1166132,1167045,1174618,1184808,1184810,1184816,1190469,1190499,1195972,1195982,1198288
+/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,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201863
Modified:
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1201864&r1=1201863&r2=1201864&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Mon Nov 14 20:11:42 2011
@@ -720,7 +720,7 @@ public class BeanUtil {
helper, true, objectSupplier,
genericType);
valueList.add(o);
}
-if (valueList.get(0) == null) {
+if (valueList.size() == 1 && valueList.get(0) == null) {
retObjs[count] = null;
} else {
retObjs[count] = ConverterUtil.convertToArray(arrayClassType,
svn commit: r1201957 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Author: sagara
Date: Mon Nov 14 22:58:18 2011
New Revision: 1201957
URL: http://svn.apache.org/viewvc?rev=1201957&view=rev
Log:
Fixed AXIS2-5182
Used proper type to fix Class cast exception issue.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=1201957&r1=1201956&r2=1201957&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Mon Nov 14 22:58:18 2011
@@ -38,7 +38,6 @@ import org.apache.axis2.util.OptionsPars
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
@@ -170,11 +169,11 @@ public class SimpleHTTPServer implements
// should all transports be started? specified as "-t all"
if (startAllTransports) {
-Iterator iter = configctx.getAxisConfiguration().
+Iterator iter = configctx.getAxisConfiguration().
getTransportsIn().keySet().iterator();
while (iter.hasNext()) {
-QName trp = (QName) iter.next();
-if (!new QName(Constants.TRANSPORT_HTTP).equals(trp)) {
+String trp = iter.next();
+if (!Constants.TRANSPORT_HTTP.equals(trp)) {
trsIn = (TransportInDescription)
configctx.getAxisConfiguration().getTransportsIn().get(trp);
listenerManager.addListener(trsIn, false);
svn commit: r1201958 - in /axis/axis2/java/core/branches/1_6: ./ modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Author: sagara
Date: Mon Nov 14 23:04:06 2011
New Revision: 1201958
URL: http://svn.apache.org/viewvc?rev=1201958&view=rev
Log:
Merged r1201957 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 23:04:06 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,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201863
+/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,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201863,1201957
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=1201958&r1=1201957&r2=1201958&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Mon Nov 14 23:04:06 2011
@@ -38,7 +38,6 @@ import org.apache.axis2.util.OptionsPars
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
@@ -170,11 +169,11 @@ public class SimpleHTTPServer implements
// should all transports be started? specified as "-t all"
if (startAllTransports) {
-Iterator iter = configctx.getAxisConfiguration().
+Iterator iter = configctx.getAxisConfiguration().
getTransportsIn().keySet().iterator();
while (iter.hasNext()) {
-QName trp = (QName) iter.next();
-if (!new QName(Constants.TRANSPORT_HTTP).equals(trp)) {
+String trp = iter.next();
+if (!Constants.TRANSPORT_HTTP.equals(trp)) {
trsIn = (TransportInDescription)
configctx.getAxisConfiguration().getTransportsIn().get(trp);
listenerManager.addListener(trsIn, false);
svn commit: r1201986 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
Author: veithen
Date: Tue Nov 15 00:52:28 2011
New Revision: 1201986
URL: http://svn.apache.org/viewvc?rev=1201986&view=rev
Log:
Merged r1201467 to the 1.6 branch to make sure that the build succeeds with
Axiom 1.2.13-SNAPSHOT.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 15 00:52:28 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,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201863,1201957
+/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,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957
Modified:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1201986&r1=1201985&r2=1201986&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Tue Nov 15 00:52:28 2011
@@ -173,10 +173,23 @@ public class SOAPElementImpl extends Nod
/* (non-Javadoc)
* @see javax.xml.soap.SOAPElement#addChildElement(java.lang.String,
java.lang.String, java.lang.String)
*/
-public SOAPElement addChildElement(String localName, String prefix, String
uri)
+public SOAPElement addChildElement(String localName, String prefix, String
namespaceURI)
throws SOAPException {
-OMNamespace omNamespace = prefix == null || prefix.length() == 0 ?
element.declareDefaultNamespace(uri) : element.declareNamespace(uri, prefix);
-return addChildElement(localName, omNamespace.getPrefix());
+if (prefix == null) {
+prefix = "";
+}
+SOAPElementImpl childEle =
+new SOAPElementImpl((ElementImpl)getOwnerDocument().
+createElementNS(namespaceURI, prefix.length() == 0 ?
localName : prefix + ":" + localName));
+
+childEle.element.setUserData(SAAJ_NODE, childEle, null);
+childEle.element.setNamespace(prefix.length() == 0
+? childEle.element.declareDefaultNamespace(namespaceURI)
+: childEle.element.declareNamespace(namespaceURI, prefix));
+element.appendChild(childEle.element);
+((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE,
this, null);
+childEle.setParentElement(this);
+return childEle;
}
/* (non-Javadoc)
@@ -189,18 +202,7 @@ public class SOAPElementImpl extends Nod
throw new SOAPException("Namespace not declared for the give
prefix: " + prefix);
}
-SOAPElementImpl childEle =
-new SOAPElementImpl((ElementImpl)getOwnerDocument().
-createElementNS(namespaceURI, prefix + ":" +
localName));
-
-childEle.element.setUserD
svn commit: r1201993 - in /axis/axis2/java/core/trunk/modules: adb-codegen/src/org/apache/axis2/schema/ adb-codegen/src/org/apache/axis2/schema/template/ adb-codegen/src/org/apache/axis2/schema/writer
Author: sagara
Date: Tue Nov 15 01:20:54 2011
New Revision: 1201993
URL: http://svn.apache.org/viewvc?rev=1201993&view=rev
Log:
Applied the patch for AXIS2-4859.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
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
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/WSDL2Code.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java?rev=1201993&r1=1201992&r2=1201993&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
Tue Nov 15 01:20:54 2011
@@ -204,4 +204,18 @@ public class CompilerOptions {
public void setUseWrapperClasses(boolean useWrapperClasses) {
this.isUseWrapperClasses = useWrapperClasses;
}
+
+/**
+ * Should unexpected elements be ignored (log warning) instead of
+ * creating an exception?
+ */
+private boolean isIgnoreUnexpected;
+
+public boolean isIgnoreUnexpected() {
+return isIgnoreUnexpected;
+}
+
+public void setIgnoreUnexpected(boolean isIgnoreUnexpected) {
+this.isIgnoreUnexpected = isIgnoreUnexpected;
+}
}
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?rev=1201993&r1=1201992&r2=1201993&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
Tue Nov 15 01:20:54 2011
@@ -606,6 +606,10 @@ public class ExtensionUtility {
if
(propertyMap.containsKey(SchemaConstants.SchemaCompilerArguments.USE_WRAPPER_CLASSES)){
options.setUseWrapperClasses(true);
}
+
+if
(propertyMap.containsKey(SchemaConstants.SchemaCompilerArguments.IGNORE_UNEXPECTED)){
+options.setIgnoreUnexpected(true);
+}
//set helper mode
//this becomes effective only if the classes are unpacked
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java?rev=1201993&r1=1201992&r2=1201993&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
Tue Nov 15 01:20:54 2011
@@ -166,6 +166,8 @@ public class SchemaConstants {
public static final String OFF_STRICT_VALIDATION = "osv";
// this option is used to use Wrapper classes for primitives
public static final String USE_WRAPPER_CLASSES = "uwc";
+// This option logs warnings instead of throwing exceptions for
unexpected elements
+public static final String IGNORE_UNEXPECTED = "iu";
}
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=1201993&r1=1201992&r2=1201993&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
Tue Nov 15 01:20:54 2011
@@ -39,6 +39,7 @@
+
