You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/04/18 15:17:28 UTC
svn commit: r649524 - in /webservices/axis2/branches/java/1_4/modules:
adb/src/org/apache/axis2/databinding/utils/BeanUtil.java jaxbri/pom.xml
Author: dims
Date: Fri Apr 18 06:17:27 2008
New Revision: 649524
URL: http://svn.apache.org/viewvc?rev=649524&view=rev
Log:
Sync with Axis2 trunk
Modified:
webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/branches/java/1_4/modules/jaxbri/pom.xml
Modified: webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=649524&r1=649523&r2=649524&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/branches/java/1_4/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Fri Apr 18 06:17:27 2008
@@ -158,6 +158,9 @@
HashMap propertMap = new HashMap();
for (int i = 0; i < propDescs.length; i++) {
PropertyDescriptor propDesc = propDescs[i];
+ if (propDesc.getName().equals("class")) {
+ continue;
+ }
propertMap.put(propDesc.getName(), propDesc);
}
ArrayList object = new ArrayList();
@@ -166,7 +169,10 @@
PropertyDescriptor propDesc = (PropertyDescriptor)propertMap.get(
getCorrectName(property.getSimpleName()));
if (propDesc == null) {
- // JAM does bad thing so I need to add this
+ propDesc = (PropertyDescriptor)propertMap.get(
+ (property.getSimpleName()));
+ }
+ if (propDesc == null) {
continue;
}
Class ptype = propDesc.getPropertyType();
@@ -313,13 +319,13 @@
boolean processingDocLitBare) {
if (elemntNameSpace != null) {
object.add(new QName(elemntNameSpace.getNamespaceURI(),
- propDesc.getName(), elemntNameSpace.getPrefix()));
+ getCorrectName(propDesc.getName()) , elemntNameSpace.getPrefix()));
} else {
if(processingDocLitBare){
- object.add(new QName(propDesc.getName()));
+ object.add(new QName(getCorrectName(propDesc.getName())));
} else {
object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ getCorrectName(propDesc.getName()), beanName.getPrefix()));
}
}
Modified: webservices/axis2/branches/java/1_4/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/jaxbri/pom.xml?rev=649524&r1=649523&r2=649524&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_4/modules/jaxbri/pom.xml (original)
+++ webservices/axis2/branches/java/1_4/modules/jaxbri/pom.xml Fri Apr 18 06:17:27 2008
@@ -160,7 +160,7 @@
<configuration>
<skip>false</skip>
<forkMode>once</forkMode>
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
+ <argLine>-Djava.endorsed.dirs=${settings.localRepository}/javax/xml/bind/jaxb-api/${jaxb.api.version}</argLine>
<includes>
<include>**/*Test.java</include>
</includes>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org