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 de...@apache.org on 2006/08/31 12:13:14 UTC
svn commit: r438855 - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
kernel/src/org/apache/axis2/engine/DependencyManager.java
Author: deepal
Date: Thu Aug 31 03:13:11 2006
New Revision: 438855
URL: http://svn.apache.org/viewvc?rev=438855&view=rev
Log:
- change asn to ax2 in scheamGenerator
- fix BeanUtil to serialize object array correctly
- pass correct number of argument to service impl class for startup
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=438855&r1=438854&r2=438855&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Thu Aug 31 03:13:11 2006
@@ -60,7 +60,7 @@
jam_service_parms.includeClass(beanObject.getClass().getName());
JamService service = factory.createService(jam_service_parms);
JamClassIterator jClassIter = service.getClasses();
- JClass jClass ;
+ JClass jClass;
if (jClassIter.hasNext()) {
jClass = (JClass) jClassIter.next();
} else {
@@ -93,7 +93,7 @@
if (SimpleTypeMapper.isSimpleType(ptype)) {
Object value = propDesc.getReadMethod().invoke(beanObject,
(Object[]) null);
- object.add(new QName(beanName.getNamespaceURI(),propDesc.getName(),beanName.getPrefix()));
+ object.add(new QName(beanName.getNamespaceURI(), propDesc.getName(), beanName.getPrefix()));
object.add(value == null ? null : SimpleTypeMapper.getStringValue(value));
} else if (ptype.isArray()) {
Object value [] = (Object[]) propDesc.getReadMethod().invoke(beanObject,
@@ -101,13 +101,13 @@
if (SimpleTypeMapper.isSimpleType(ptype.getComponentType())) {
for (int j = 0; j < value.length; j++) {
Object o = value[j];
- object.add(new QName(beanName.getNamespaceURI(),propDesc.getName(),beanName.getPrefix()));
- object.add(o == null ? null : SimpleTypeMapper.getStringValue(o));
+ object.add(new QName(beanName.getNamespaceURI(), propDesc.getName(), beanName.getPrefix()));
+ object.add(o == null ? null : SimpleTypeMapper.getStringValue(o));
}
} else {
for (int j = 0; j < value.length; j++) {
Object o = value[j];
- object.add(new QName(beanName.getNamespaceURI(),propDesc.getName(),beanName.getPrefix()));
+ object.add(new QName(beanName.getNamespaceURI(), propDesc.getName(), beanName.getPrefix()));
object.add(o);
}
}
@@ -123,10 +123,10 @@
for (int j = 0; j < objList.size(); j++) {
Object o = objList.get(j);
if (SimpleTypeMapper.isSimpleType(o)) {
- object.add(new QName(beanName.getNamespaceURI(),propDesc.getName(),beanName.getPrefix()));
+ object.add(new QName(beanName.getNamespaceURI(), propDesc.getName(), beanName.getPrefix()));
object.add(o);
} else {
- object.add(new QName(beanName.getNamespaceURI(),propDesc.getName(),beanName.getPrefix()));
+ object.add(new QName(beanName.getNamespaceURI(), propDesc.getName(), beanName.getPrefix()));
object.add(o);
}
}
@@ -474,24 +474,29 @@
Object array [] = (Object[]) arg;
for (int j = 0; j < array.length; j++) {
Object o = array[j];
- if (SimpleTypeMapper.isSimpleType(o)) {
+ if (o == null) {
objects.add("item" + argCount);
- objects.add(o == null ? null : SimpleTypeMapper.getStringValue(o));
+ objects.add(o);
} else {
- objects.add(new QName("item" + argCount));
- if (o instanceof OMElement) {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMElement wrappingElement;
- if (partName == null) {
- wrappingElement = fac.createOMElement("item" + argCount, null);
- wrappingElement.addChild((OMElement) o);
+ if (SimpleTypeMapper.isSimpleType(o)) {
+ objects.add("item" + argCount);
+ objects.add(SimpleTypeMapper.getStringValue(o));
+ } else {
+ objects.add(new QName("item" + argCount));
+ if (o instanceof OMElement) {
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+ OMElement wrappingElement;
+ if (partName == null) {
+ wrappingElement = fac.createOMElement("item" + argCount, null);
+ wrappingElement.addChild((OMElement) o);
+ } else {
+ wrappingElement = fac.createOMElement(partName, null);
+ wrappingElement.addChild((OMElement) o);
+ }
+ objects.add(wrappingElement);
} else {
- wrappingElement = fac.createOMElement(partName, null);
- wrappingElement.addChild((OMElement) o);
+ objects.add(o);
}
- objects.add(wrappingElement);
- } else {
- objects.add(o);
}
}
}
@@ -547,6 +552,7 @@
/**
* increments the namespace counter and returns a new prefix
+ *
* @return unique prefix
*/
public static String getUniquePrefix() {
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?rev=438855&r1=438854&r2=438855&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java Thu Aug 31 03:13:11 2006
@@ -46,7 +46,7 @@
public class SchemaGenerator implements Java2WSDLConstants {
- public static final String NAME_SPACE_PREFIX = "ans";// axis2 name space
+ public static final String NAME_SPACE_PREFIX = "ax2";// axis2 name space
private static int prefixCount = 1;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?rev=438855&r1=438854&r2=438855&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java Thu Aug 31 03:13:11 2006
@@ -162,7 +162,7 @@
Method[] methods = serviceImpl.getClass().getMethods();
for (int i = 0; i < methods.length; i++) {
if (SERVICE_START_METHOD.equals(methods[i].getName())
- && (methods[i].getParameterTypes().length == 1)
+ && (methods[i].getParameterTypes().length == 2)
&& (methods[i].getParameterTypes()[0] == ConfigurationContext.class)
&& (methods[i].getParameterTypes()[1] == AxisService.class)) {
methods[i].invoke(serviceImpl, new Object[]{configCtx, axisService});
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org