You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/10/25 11:35:41 UTC
svn commit: r467591 - in /webservices/axis2/branches/java/1_1/modules:
adb-codegen/src/org/apache/axis2/schema/template/
adb/src/org/apache/axis2/databinding/utils/
integration/test/org/apache/axis2/rpc/
Author: deepal
Date: Wed Oct 25 02:35:40 2006
New Revision: 467591
URL: http://svn.apache.org/viewvc?view=rev&rev=467591
Log:
fixing AXIS2-1227
- and fixed the build error
PLEASE dont commit code w.o running the build. there was a compile error in the build.
Modified:
webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=467591&r1=467590&r2=467591
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Wed Oct 25 02:35:40 2006
@@ -1890,7 +1890,7 @@
reader.next();
if (reader.isEndElement()) {
// we have two countinuos end elements
- loopDone1 = true;
+ <xsl:value-of select="$loopBoolName"/> = true;
}
}else if (javax.xml.stream.XMLStreamConstants.END_DOCUMENT == event){
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=467591&r1=467590&r2=467591
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Wed Oct 25 02:35:40 2006
@@ -216,7 +216,8 @@
public static Object deserialize(Class beanClass,
OMElement beanElement,
- ObjectSupplier objectSupplier)
+ ObjectSupplier objectSupplier,
+ String arrayLocalName)
throws AxisFault {
Object beanObj;
try {
@@ -229,9 +230,12 @@
Object objValue = parts.next();
if (objValue instanceof OMElement) {
omElement = (OMElement) objValue;
+ if (!arrayLocalName.equals(omElement.getLocalName())) {
+ continue;
+ }
Object obj = deserialize(arrayClassType,
omElement,
- objectSupplier);
+ objectSupplier, null);
if (obj != null) {
valueList.add(obj);
}
@@ -278,9 +282,10 @@
partObj = SimpleTypeMapper.getArrayList((OMElement)
parts.getParent(), prty.getName());
} else if (parameters.isArray()) {
- partObj = deserialize(parameters, (OMElement) parts.getParent(), objectSupplier);
+ partObj = deserialize(parameters, (OMElement) parts.getParent(),
+ objectSupplier, prty.getName());
} else {
- partObj = deserialize(parameters, parts, objectSupplier);
+ partObj = deserialize(parameters, parts, objectSupplier, null);
}
Object [] parms = new Object[]{partObj};
prty.getWriteMethod().invoke(beanObj, parms);
@@ -346,7 +351,7 @@
} else {
partObj = SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
if (partObj == null) {
- partObj = deserialize(parameters, parts, objectSupplier);
+ partObj = deserialize(parameters, parts, objectSupplier, null);
}
}
Object [] parms = new Object[]{partObj};
@@ -538,7 +543,7 @@
} else if (SimpleTypeMapper.isArrayList(classType)) {
return SimpleTypeMapper.getArrayList(omElement);
} else {
- return BeanUtil.deserialize(classType, omElement, objectSupplier);
+ return BeanUtil.deserialize(classType, omElement, objectSupplier, null);
}
}
}
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?view=diff&rev=467591&r1=467590&r2=467591
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Wed Oct 25 02:35:40 2006
@@ -351,7 +351,7 @@
SOAPEnvelope env = responseMessageContx.getEnvelope();
OMElement response = env.getBody().getFirstElement();
- MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement() , new DefaultObjectSupplier());
+ MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement() , new DefaultObjectSupplier(), null);
assertNotNull(resBean);
assertEquals(resBean.getAge(), 159);
}
@@ -411,7 +411,7 @@
SOAPEnvelope env = responseMessageContx.getEnvelope();
OMElement response = env.getBody().getFirstElement();
- MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement() , new DefaultObjectSupplier());
+ MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement() , new DefaultObjectSupplier(), null);
assertNotNull(resBean);
assertEquals(resBean.getAge(), 159);
}
@@ -546,7 +546,7 @@
SOAPEnvelope env = responseMessageContx.getEnvelope();
- Employee emp = (Employee) BeanUtil.deserialize(Employee.class, env.getBody().getFirstElement().getFirstElement() , new DefaultObjectSupplier());
+ Employee emp = (Employee) BeanUtil.deserialize(Employee.class, env.getBody().getFirstElement().getFirstElement() , new DefaultObjectSupplier(), null);
assertNotNull(emp);
}
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?view=diff&rev=467591&r1=467590&r2=467591
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Wed Oct 25 02:35:40 2006
@@ -129,7 +129,7 @@
args.add("159");
OMElement response = sender.invokeBlocking(operationName, args.toArray());
- MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement(), new DefaultObjectSupplier());
+ MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement(), new DefaultObjectSupplier(), null);
assertNotNull(resBean);
assertEquals(resBean.getAge(), 159);
}
@@ -173,7 +173,7 @@
OMElement response = sender.invokeBlocking(operationName, args.toArray());
MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class,
- response.getFirstElement(), new DefaultObjectSupplier());
+ response.getFirstElement(), new DefaultObjectSupplier(), null);
// MyBean resBean =(MyBean) new BeanSerializer(MyBean.class,response).deserilze();
assertNotNull(resBean);
assertEquals(resBean.getAge(), 100);
@@ -205,7 +205,7 @@
OMElement response = sender.invokeBlocking(operationName, args.toArray());
Mail resBean = (Mail) BeanUtil.deserialize(Mail.class, response.getFirstElement(),
- new DefaultObjectSupplier());
+ new DefaultObjectSupplier(), null);
// MyBean resBean =(MyBean) new BeanSerializer(MyBean.class,response).deserilze();
assertNotNull(resBean);
assertEquals(resBean.getBody(), "My Body");
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java?view=diff&rev=467591&r1=467590&r2=467591
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java Wed Oct 25 02:35:40 2006
@@ -123,14 +123,14 @@
}
public MyBean beanOM(OMElement element, int val) throws AxisFault {
- MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSupplier());
+ MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSupplier(), null);
bean.setAge(val);
return bean;
}
public boolean omrefs(OMElement element, OMElement element2) throws AxisFault {
- MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSupplier());
- MyBean bean2 = (MyBean) BeanUtil.deserialize(MyBean.class, element2 , new DefaultObjectSupplier());
+ MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSupplier(), null);
+ MyBean bean2 = (MyBean) BeanUtil.deserialize(MyBean.class, element2 , new DefaultObjectSupplier(), null);
return bean2 != null && bean != null;
}
@@ -169,7 +169,7 @@
ArrayList tems = new ArrayList();
for (int i = 0; i < pss.size(); i++) {
OMElement omElement = (OMElement) pss.get(i);
- Person p = (Person) BeanUtil.deserialize(Person.class, omElement , new DefaultObjectSupplier());
+ Person p = (Person) BeanUtil.deserialize(Person.class, omElement , new DefaultObjectSupplier(), null);
tems.add(p);
}
com.setPersons(tems);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org