svn commit: r1213639 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java

2011-12-13 Thread sagara
Author: sagara
Date: Tue Dec 13 10:28:49 2011
New Revision: 1213639

URL: http://svn.apache.org/viewvc?rev=1213639&view=rev
Log:
Fixed AXIS2-5072 - Added a condition to skip indexed properties.

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=1213639&r1=1213638&r2=1213639&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
 Tue Dec 13 10:28:49 2011
@@ -172,12 +172,12 @@ public class BeanUtil {
 PropertyDescriptor[] properties = 
beanInfo.getPropertyDescriptors();
 for (PropertyDescriptor property : properties) {
 String propertyName = property.getName();
+Class ptype = property.getPropertyType();
 if (propertyName.equals("class") ||
-beanExcludeInfo != null && 
beanExcludeInfo.isExcludedProperty(propertyName)) {
+beanExcludeInfo != null && 
beanExcludeInfo.isExcludedProperty(propertyName) || ptype == null) {
 continue;
 }
 
-Class ptype = property.getPropertyType();
 Method readMethod = property.getReadMethod();
 if (readMethod == null) {
 Class propertyType = property.getPropertyType();




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

2011-12-13 Thread sagara
Author: sagara
Date: Tue Dec 13 10:35:27 2011
New Revision: 1213640

URL: http://svn.apache.org/viewvc?rev=1213640&view=rev
Log:
Merged r1213639 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 Tue Dec 13 10:35:27 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,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034
+/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,1202867,1203424,1205716,1205939,1208901,1209034,1213639

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=1213640&r1=1213639&r2=1213640&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
 Tue Dec 13 10:35:27 2011
@@ -147,12 +147,12 @@ public class BeanUtil {
 PropertyDescriptor[] properties = 
beanInfo.getPropertyDescriptors();
 for (PropertyDescriptor property : properties) {
 String propertyName = property.getName();
+Class ptype = property.getPropertyType();
 if (propertyName.equals("class") ||
-beanExcludeInfo != null && 
beanExcludeInfo.isExcludedProperty(propertyName)) {
+beanExcludeInfo != null && 
beanExcludeInfo.isExcludedProperty(propertyName) || ptype == null) {
 continue;
 }
 
-Class ptype = property.getPropertyType();
 Method readMethod = property.getReadMethod();
 if (readMethod == null) {
 Class propertyType = property.getPropertyType();




svn commit: r1213667 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java

2011-12-13 Thread sagara
Author: sagara
Date: Tue Dec 13 12:52:36 2011
New Revision: 1213667

URL: http://svn.apache.org/viewvc?rev=1213667&view=rev
Log:
Fixed AXIS2-5174.

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1213667&r1=1213666&r2=1213667&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
 Tue Dec 13 12:52:36 2011
@@ -192,12 +192,15 @@ public class RPCMessageReceiver extends 
exceptionElement.addChild(innterExceptionElement);
 } else {
 // if it is a normal bussiness exception we need to 
generate the schema assuming it is a pojo
+// Ignore RuntimeException because no way to map type 
info. 
+if (!(cause instanceof RuntimeException)) {
 QName innerElementQName = new 
QName(elementQName.getNamespaceURI(), getSimpleClassName(exceptionType));
 XMLStreamReader xr = BeanUtil.getPullParser(cause,
 innerElementQName, typeTable, true, false);
 StAXOMBuilder stAXOMBuilder = new 
StAXOMBuilder(OMAbstractFactory.getOMFactory(), new StreamWrapper(xr));
 OMElement documentElement = 
stAXOMBuilder.getDocumentElement();
 exceptionElement.addChild(documentElement);
+}
 }
 
 AxisFault axisFault = new AxisFault(cause.getMessage());




svn commit: r1213899 - /axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf

2011-12-13 Thread veithen
Author: veithen
Date: Tue Dec 13 19:54:50 2011
New Revision: 1213899

URL: http://svn.apache.org/viewvc?rev=1213899&view=rev
Log:
Fixed the incorrect project name in the DOAP file.

Modified:
axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf

Modified: axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf?rev=1213899&r1=1213898&r2=1213899&view=diff
==
--- axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf (original)
+++ axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf Tue Dec 13 19:54:50 2011
@@ -25,7 +25,7 @@
   http://axis.apache.org/axis2/java/sandesha/";>
 2010-12-19
 http://usefulinc.com/doap/licenses/asl20"/>
-Apache Axiom
+Apache Sandesha2
 http://axis.apache.org/axis2/java/sandesha/"/>
 http://axis.apache.org"/>
 Apache Sandesha2 is an Axis2 module implementing 
WS-RM.