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/10/24 13:59:53 UTC
svn commit: r467316 - in /webservices/axis2/branches/java/1_1: etc/
modules/adb/src/org/apache/axis2/databinding/utils/
modules/adb/src/org/apache/axis2/databinding/utils/reader/
modules/adb/src/org/apache/axis2/rpc/receivers/ modules/java2wsdl/src/org...
Author: deepal
Date: Tue Oct 24 04:59:52 2006
New Revision: 467316
URL: http://svn.apache.org/viewvc?view=rev&rev=467316
Log:
fixing 1440
Modified:
webservices/axis2/branches/java/1_1/etc/project.properties
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
Modified: webservices/axis2/branches/java/1_1/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/etc/project.properties?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/etc/project.properties (original)
+++ webservices/axis2/branches/java/1_1/etc/project.properties Tue Oct 24 04:59:52 2006
@@ -108,7 +108,7 @@
jaxbri.version=2.0.2
jaxen.version=1.1-beta-10
jaxme.version=0.5.1
-jibx.version=1.1.1
+jibx.version=SNAPSHOT
junit.version=3.8.2
maven.itest.plugin.version=1.0
opensaml.version=1.1
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=467316&r1=467315&r2=467316
==============================================================================
--- 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 Tue Oct 24 04:59:52 2006
@@ -29,6 +29,7 @@
import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.StreamWrapper;
+import org.apache.ws.java2wsdl.utils.TypeTable;
import org.codehaus.jam.*;
import javax.xml.namespace.QName;
@@ -53,7 +54,9 @@
* @param beanObject
* @param beanName
*/
- public static XMLStreamReader getPullParser(Object beanObject, QName beanName) {
+ public static XMLStreamReader getPullParser(Object beanObject,
+ QName beanName,
+ TypeTable typeTable) {
try {
JamServiceFactory factory = JamServiceFactory.getInstance();
JamServiceParams jam_service_parms = factory.createServiceParams();
@@ -96,8 +99,12 @@
if (SimpleTypeMapper.isSimpleType(ptype)) {
Object value = propDesc.getReadMethod().invoke(beanObject,
null);
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ if (typeTable != null) {
+ object.add(typeTable.getQNamefortheType(ptype.getName()));
+ } else {
+ 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,
@@ -105,15 +112,23 @@
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()));
+ if (typeTable != null) {
+ object.add(typeTable.getQNamefortheType(ptype.getName()));
+ } else {
+ 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()));
+ if (typeTable != null) {
+ object.add(typeTable.getQNamefortheType(ptype.getName()));
+ } else {
+ object.add(new QName(beanName.getNamespaceURI(),
+ propDesc.getName(), beanName.getPrefix()));
+ }
object.add(o);
}
}
@@ -129,19 +144,32 @@
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()));
+ if (typeTable != null) {
+ object.add(typeTable.getQNamefortheType(ptype.getName()));
+ } else {
+ object.add(new QName(beanName.getNamespaceURI(),
+ propDesc.getName(), beanName.getPrefix()));
+ }
object.add(o);
} else {
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ if (typeTable != null) {
+ object.add(typeTable.getQNamefortheType(ptype.getName()));
+ } else {
+ object.add(new QName(beanName.getNamespaceURI(),
+ propDesc.getName(), beanName.getPrefix()));
+ }
object.add(o);
}
}
}
} else {
- object.add(new QName(propDesc.getName()));
+ if (typeTable != null) {
+ object.add(typeTable.getQNamefortheType(ptype.getName()));
+ } else {
+ object.add(new QName(beanName.getNamespaceURI(),
+ propDesc.getName(), beanName.getPrefix()));
+ }
Object value = propDesc.getReadMethod().invoke(beanObject,
null);
object.add(value);
@@ -170,7 +198,7 @@
className = className.substring(className.lastIndexOf('.') + 1,
className.length());
}
- return getPullParser(beanObject, new QName(className));
+ return getPullParser(beanObject, new QName(className) , null);
}
public static Object deserialize(Class beanClass,
@@ -300,7 +328,7 @@
String refId = MultirefHelper.getAttvalue(attr);
partObj = helper.getObject(refId);
if (partObj == null) {
- partObj = helper.processRef(parameters, refId , objectSupplier);
+ partObj = helper.processRef(parameters, refId, objectSupplier);
}
} else {
partObj = SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
@@ -479,7 +507,7 @@
if (helper.getObject(ref) != null) {
return helper.getObject(ref);
} else {
- return helper.processRef(classType, ref , objectSupplier);
+ return helper.processRef(classType, ref, objectSupplier);
}
} else {
OMAttribute attribute = omElement.getAttribute(
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Tue Oct 24 04:59:52 2006
@@ -934,7 +934,7 @@
//the thing as a bean and try generating events from it
childReader = new WrappingXMLStreamReader
(BeanUtil.getPullParser(propertyValue,
- propertyQName));
+ propertyQName, null));
//we cannot register the namespace context here
}
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java Tue Oct 24 04:59:52 2006
@@ -25,7 +25,6 @@
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.receivers.AbstractInOutAsyncMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -107,7 +106,7 @@
}
Object[] objectArray = RPCUtil.processRequest(methodElement,
- method ,inMessage.getAxisService().getObjectSupplier());
+ method, inMessage.getAxisService().getObjectSupplier());
resObject = method.invoke(obj, objectArray);
}
@@ -149,8 +148,16 @@
objArray, service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
- RPCUtil.processResponse(fac, resObject, bodyContent, ns,
- envelope, method, service.isElementFormDefault());
+ if (service.isElementFormDefault()) {
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault(),
+ service.getTypeTable());
+ } else {
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault(),
+ null);
+ }
+
}
}
outMessage.setEnvelope(envelope);
@@ -161,13 +168,13 @@
}
if (msg == null) {
msg = "Exception occurred while trying to invoke service method " +
- method.getName();
+ method.getName();
}
log.error(msg, e);
throw new AxisFault(msg);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service method " +
- method.getName();
+ method.getName();
log.error(msg, e);
throw new AxisFault(msg, e);
}
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Tue Oct 24 04:59:52 2006
@@ -30,7 +30,6 @@
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -38,8 +37,8 @@
import javax.xml.namespace.QName;
import java.lang.reflect.Array;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
public class RPCMessageReceiver extends AbstractInOutSyncMessageReceiver {
@@ -103,20 +102,20 @@
if (messageNameSpace != null) {
if (namespace == null) {
throw new AxisFault("namespace mismatch require " +
- messageNameSpace +
- " found none");
+ messageNameSpace +
+ " found none");
}
if (!messageNameSpace.equals(namespace.getNamespaceURI())) {
throw new AxisFault("namespace mismatch require " +
- messageNameSpace +
- " found " + methodElement.getNamespace().getNamespaceURI());
+ messageNameSpace +
+ " found " + methodElement.getNamespace().getNamespaceURI());
}
} else if (namespace != null) {
throw new AxisFault("namespace mismatch. Axis Oepration expects non-namespace " +
- "qualified element. But received a namespace qualified element");
+ "qualified element. But received a namespace qualified element");
}
- Object[] objectArray = RPCUtil.processRequest(methodElement, method ,
+ Object[] objectArray = RPCUtil.processRequest(methodElement, method,
inMessage.getAxisService().getObjectSupplier());
resObject = method.invoke(obj, objectArray);
}
@@ -133,16 +132,16 @@
}
OMNamespace ns = fac.createOMNamespace(messageNameSpace,
- service.getSchematargetNamespacePrefix());
+ service.getSchematargetNamespacePrefix());
SOAPEnvelope envelope = fac.getDefaultEnvelope();
OMElement bodyContent = null;
if (resObject instanceof Object[]) {
QName resName = new QName(service.getSchematargetNamespace(),
- method.getName() + "Response",
- service.getSchematargetNamespacePrefix());
+ method.getName() + "Response",
+ service.getSchematargetNamespacePrefix());
OMElement bodyChild = RPCUtil.getResponseElement(resName,
- (Object[]) resObject, service.isElementFormDefault());
+ (Object[]) resObject, service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
if (resObject.getClass().isArray()) {
@@ -159,14 +158,21 @@
}
QName resName = new QName(service.getSchematargetNamespace(),
- method.getName() + "Response",
- service.getSchematargetNamespacePrefix());
+ method.getName() + "Response",
+ service.getSchematargetNamespacePrefix());
OMElement bodyChild = RPCUtil.getResponseElementForArray(resName,
- objArray, service.isElementFormDefault());
+ objArray, service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
- RPCUtil.processResponse(fac, resObject, bodyContent, ns,
- envelope, method, service.isElementFormDefault());
+ if (service.isElementFormDefault()) {
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault(),
+ service.getTypeTable());
+ } else {
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault(),
+ null);
+ }
}
}
outMessage.setEnvelope(envelope);
@@ -177,13 +183,13 @@
}
if (msg == null) {
msg = "Exception occurred while trying to invoke service method " +
- method.getName();
+ method.getName();
}
log.error(msg, e);
throw new AxisFault(msg);
} catch (Exception e) {
String msg = "Exception occurred while trying to invoke service method " +
- method.getName();
+ method.getName();
log.error(msg, e);
throw new AxisFault(msg, e);
}
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java Tue Oct 24 04:59:52 2006
@@ -12,6 +12,7 @@
import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
import org.apache.axis2.databinding.utils.BeanUtil;
import org.apache.axis2.util.StreamWrapper;
+import org.apache.ws.java2wsdl.utils.TypeTable;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -42,7 +43,9 @@
OMElement bodyContent,
OMNamespace ns,
SOAPEnvelope envelope,
- Method method, boolean qualified) {
+ Method method,
+ boolean qualified ,
+ TypeTable typeTable) {
if (resObject != null) {
//simple type
if (resObject instanceof OMElement) {
@@ -80,7 +83,7 @@
returnWrapper = new QName(RETURN_WRAPPER);
}
XMLStreamReader xr = BeanUtil.getPullParser(resObject,
- returnWrapper);
+ returnWrapper , typeTable);
StAXOMBuilder stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getOMFactory(), new StreamWrapper(xr));
Modified: webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java (original)
+++ webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java Tue Oct 24 04:59:52 2006
@@ -396,12 +396,6 @@
return complexType;
}
-
- private String formGlobalElementName(String typeName) {
- String firstChar = typeName.substring(0, 1);
- return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
- }
-
private XmlSchema getXmlSchema(String targetNamespace) {
XmlSchema xmlSchema;
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Tue Oct 24 04:59:52 2006
@@ -281,6 +281,7 @@
Collection schemas = schemaGenerator.generateSchema();
axisService.addSchema(schemas);
axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
+ axisService.setTypeTable(schemaGenerator.getTypeTable());
if (Java2WSDLConstants.DEFAULT_TARGET_NAMESPACE.equals(
axisService.getTargetNamespace())) {
axisService.setTargetNamespace(schemaGenerator.getTargetNamespace());
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=467316&r1=467315&r2=467316
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java Tue Oct 24 04:59:52 2006
@@ -180,6 +180,8 @@
// package to namespace mapping
private Map p2nMap;
+ private TypeTable typeTable;
+
public String getWSAddressingFlag() {
return wsaddressingFlag;
}
@@ -680,7 +682,7 @@
}
}
- private void setPortAddress(Definition definition) throws AxisFault{
+ private void setPortAddress(Definition definition) throws AxisFault {
Iterator serviceItr = definition.getServices().values().iterator();
while (serviceItr.hasNext()) {
Service serviceElement = (Service) serviceItr.next();
@@ -690,8 +692,8 @@
List list = port.getExtensibilityElements();
for (int i = 0; i < list.size(); i++) {
Object extensibilityEle = list.get(i);
- if(extensibilityEle instanceof SOAPAddress) {
- ((SOAPAddress)extensibilityEle).setLocationURI(getEPRs()[0]);
+ if (extensibilityEle instanceof SOAPAddress) {
+ ((SOAPAddress) extensibilityEle).setLocationURI(getEPRs()[0]);
}
}
}
@@ -1329,6 +1331,7 @@
schemaGenerator.setExcludeMethods(excludeOpeartion);
axisService.addSchema(schemaGenerator.generateSchema());
axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
+ axisService.setTypeTable(schemaGenerator.getTypeTable());
if (targetNamespace != null && !"".equals(targetNamespace)) {
axisService.setTargetNamespace(targetNamespace);
}
@@ -1446,6 +1449,8 @@
schemaGenerator.setExcludeMethods(excludeOpeartion);
axisService.addSchema(schemaGenerator.generateSchema());
axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
+ axisService.setTypeTable(schemaGenerator.getTypeTable());
+ axisService.setTypeTable(schemaGenerator.getTypeTable());
if (targetNameSpace != null && !"".equals(targetNameSpace)) {
axisService.setTargetNamespace(targetNameSpace);
}
@@ -1752,5 +1757,13 @@
public void setObjectSupplier(ObjectSupplier objectSupplier) {
this.objectSupplier = objectSupplier;
+ }
+
+ public TypeTable getTypeTable() {
+ return typeTable;
+ }
+
+ public void setTypeTable(TypeTable typeTable) {
+ this.typeTable = typeTable;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r467316 - in /webservices/axis2/branches/java/1_1:
etc/ modules/adb/src/org/apache/axis2/databinding/utils/ modules/adb/src/org/apache/axis2/databinding/utils/reader/
modules/adb/src/org/apache/axis2/rpc/receivers/ modules/java2wsdl/src/org...
Posted by Deepal Jayasinghe <de...@opensource.lk>.
Hi Dennis;
I have changed my internal project.properties file since I couldnt able
to download those Jibx files. So I might have commit them w.o looking it
carefully. Im very sorry for that and will revert.
Thanks
Deepal
> Deepal, in this commit you changed JiBX back to the SNAPSHOT version
> from the 1.1.1 set of jars. Did you have some reason for doing this?
> If not, please correct this.
>
> Thanks,
>
> - Dennis
>
> Dennis M. Sosnoski
> SOA, Web Services, and XML
> Training and Consulting
> http://www.sosnoski.com - http://www.sosnoski.co.nz
> Seattle, WA +1-425-296-6194 - Wellington, NZ +64-4-298-6117
>
>
>
> deepal@apache.org wrote:
>
>> Author: deepal
>> Date: Tue Oct 24 04:59:52 2006
>> New Revision: 467316
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=467316
>> Log:
>> fixing 1440
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/etc/project.properties
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>>
>>
>> Modified: webservices/axis2/branches/java/1_1/etc/project.properties
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/etc/project.properties?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> --- webservices/axis2/branches/java/1_1/etc/project.properties
>> (original)
>> +++ webservices/axis2/branches/java/1_1/etc/project.properties Tue
>> Oct 24 04:59:52 2006
>> @@ -108,7 +108,7 @@
>> jaxbri.version=2.0.2
>> jaxen.version=1.1-beta-10
>> jaxme.version=0.5.1
>> -jibx.version=1.1.1
>> +jibx.version=SNAPSHOT
>> junit.version=3.8.2
>> maven.itest.plugin.version=1.0
>> opensaml.version=1.1
>>
>> 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=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> 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
>> Tue Oct 24 04:59:52 2006
>> @@ -29,6 +29,7 @@
>> import
>> org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
>> import org.apache.axis2.engine.ObjectSupplier;
>> import org.apache.axis2.util.StreamWrapper;
>> +import org.apache.ws.java2wsdl.utils.TypeTable;
>> import org.codehaus.jam.*;
>>
>> import javax.xml.namespace.QName;
>> @@ -53,7 +54,9 @@
>> * @param beanObject
>> * @param beanName
>> */
>> - public static XMLStreamReader getPullParser(Object beanObject,
>> QName beanName) {
>> + public static XMLStreamReader getPullParser(Object beanObject,
>> + QName beanName,
>> + TypeTable typeTable) {
>> try {
>> JamServiceFactory factory =
>> JamServiceFactory.getInstance();
>> JamServiceParams jam_service_parms =
>> factory.createServiceParams();
>> @@ -96,8 +99,12 @@
>> if (SimpleTypeMapper.isSimpleType(ptype)) {
>> Object value =
>> propDesc.getReadMethod().invoke(beanObject,
>> null);
>> - object.add(new QName(beanName.getNamespaceURI(),
>> - propDesc.getName(), beanName.getPrefix()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + 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,
>> @@ -105,15 +112,23 @@
>> 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()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + 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()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> object.add(o);
>> }
>> }
>> @@ -129,19 +144,32 @@
>> 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()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> object.add(o);
>> } else {
>> - object.add(new
>> QName(beanName.getNamespaceURI(),
>> - propDesc.getName(),
>> beanName.getPrefix()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> object.add(o);
>> }
>> }
>>
>> }
>> } else {
>> - object.add(new QName(propDesc.getName()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> Object value =
>> propDesc.getReadMethod().invoke(beanObject,
>> null);
>> object.add(value);
>> @@ -170,7 +198,7 @@
>> className =
>> className.substring(className.lastIndexOf('.') + 1,
>> className.length());
>> }
>> - return getPullParser(beanObject, new QName(className));
>> + return getPullParser(beanObject, new QName(className) , null);
>> }
>>
>> public static Object deserialize(Class beanClass,
>> @@ -300,7 +328,7 @@
>> String refId =
>> MultirefHelper.getAttvalue(attr);
>> partObj = helper.getObject(refId);
>> if (partObj == null) {
>> - partObj = helper.processRef(parameters,
>> refId , objectSupplier);
>> + partObj = helper.processRef(parameters,
>> refId, objectSupplier);
>> }
>> } else {
>> partObj =
>> SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
>> @@ -479,7 +507,7 @@
>> if (helper.getObject(ref) != null) {
>> return helper.getObject(ref);
>> } else {
>> - return helper.processRef(classType, ref ,
>> objectSupplier);
>> + return helper.processRef(classType, ref,
>> objectSupplier);
>> }
>> } else {
>> OMAttribute attribute = omElement.getAttribute(
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>> Tue Oct 24 04:59:52 2006
>> @@ -934,7 +934,7 @@
>> //the thing as a bean and try generating events from it
>> childReader = new WrappingXMLStreamReader
>> (BeanUtil.getPullParser(propertyValue,
>> - propertyQName));
>> + propertyQName, null));
>> //we cannot register the namespace context here
>> }
>>
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>> Tue Oct 24 04:59:52 2006
>> @@ -25,7 +25,6 @@
>> import org.apache.axis2.description.AxisMessage;
>> import org.apache.axis2.description.AxisOperation;
>> import org.apache.axis2.description.AxisService;
>> -import org.apache.axis2.engine.DependencyManager;
>> import org.apache.axis2.receivers.AbstractInOutAsyncMessageReceiver;
>> import org.apache.axis2.wsdl.WSDLConstants;
>> import org.apache.commons.logging.Log;
>> @@ -107,7 +106,7 @@
>> }
>>
>> Object[] objectArray =
>> RPCUtil.processRequest(methodElement,
>> - method
>> ,inMessage.getAxisService().getObjectSupplier());
>> + method,
>> inMessage.getAxisService().getObjectSupplier());
>> resObject = method.invoke(obj, objectArray);
>> }
>>
>> @@ -149,8 +148,16 @@
>> objArray, service.isElementFormDefault());
>> envelope.getBody().addChild(bodyChild);
>> } else {
>> - RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> - envelope, method,
>> service.isElementFormDefault());
>> + if (service.isElementFormDefault()) {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + service.getTypeTable());
>> + } else {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + null);
>> + }
>> +
>> }
>> }
>> outMessage.setEnvelope(envelope);
>> @@ -161,13 +168,13 @@
>> }
>> if (msg == null) {
>> msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> }
>> log.error(msg, e);
>> throw new AxisFault(msg);
>> } catch (Exception e) {
>> String msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> log.error(msg, e);
>> throw new AxisFault(msg, e);
>> }
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>> Tue Oct 24 04:59:52 2006
>> @@ -30,7 +30,6 @@
>> import org.apache.axis2.description.AxisMessage;
>> import org.apache.axis2.description.AxisOperation;
>> import org.apache.axis2.description.AxisService;
>> -import org.apache.axis2.engine.DependencyManager;
>> import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
>> import org.apache.axis2.wsdl.WSDLConstants;
>> import org.apache.commons.logging.Log;
>> @@ -38,8 +37,8 @@
>>
>> import javax.xml.namespace.QName;
>> import java.lang.reflect.Array;
>> -import java.lang.reflect.Method;
>> import java.lang.reflect.InvocationTargetException;
>> +import java.lang.reflect.Method;
>>
>> public class RPCMessageReceiver extends
>> AbstractInOutSyncMessageReceiver {
>>
>> @@ -103,20 +102,20 @@
>> if (messageNameSpace != null) {
>> if (namespace == null) {
>> throw new AxisFault("namespace mismatch
>> require " +
>> - messageNameSpace +
>> - " found none");
>> + messageNameSpace +
>> + " found none");
>> }
>> if
>> (!messageNameSpace.equals(namespace.getNamespaceURI())) {
>> throw new AxisFault("namespace mismatch
>> require " +
>> - messageNameSpace +
>> - " found " +
>> methodElement.getNamespace().getNamespaceURI());
>> + messageNameSpace +
>> + " found " +
>> methodElement.getNamespace().getNamespaceURI());
>> }
>> } else if (namespace != null) {
>> throw new AxisFault("namespace mismatch.
>> Axis Oepration expects non-namespace " +
>> - "qualified element. But
>> received a namespace qualified element");
>> + "qualified element. But received a
>> namespace qualified element");
>> }
>>
>> - Object[] objectArray =
>> RPCUtil.processRequest(methodElement, method ,
>> + Object[] objectArray =
>> RPCUtil.processRequest(methodElement, method,
>>
>> inMessage.getAxisService().getObjectSupplier());
>> resObject = method.invoke(obj, objectArray);
>> }
>> @@ -133,16 +132,16 @@
>> }
>>
>> OMNamespace ns = fac.createOMNamespace(messageNameSpace,
>> -
>> service.getSchematargetNamespacePrefix());
>> + service.getSchematargetNamespacePrefix());
>> SOAPEnvelope envelope = fac.getDefaultEnvelope();
>> OMElement bodyContent = null;
>>
>> if (resObject instanceof Object[]) {
>> QName resName = new
>> QName(service.getSchematargetNamespace(),
>> - method.getName() +
>> "Response",
>> -
>> service.getSchematargetNamespacePrefix());
>> + method.getName() + "Response",
>> + service.getSchematargetNamespacePrefix());
>> OMElement bodyChild =
>> RPCUtil.getResponseElement(resName,
>> -
>> (Object[]) resObject, service.isElementFormDefault());
>> + (Object[]) resObject,
>> service.isElementFormDefault());
>> envelope.getBody().addChild(bodyChild);
>> } else {
>> if (resObject.getClass().isArray()) {
>> @@ -159,14 +158,21 @@
>> }
>>
>> QName resName = new
>> QName(service.getSchematargetNamespace(),
>> - method.getName() +
>> "Response",
>> -
>> service.getSchematargetNamespacePrefix());
>> + method.getName() + "Response",
>> + service.getSchematargetNamespacePrefix());
>> OMElement bodyChild =
>> RPCUtil.getResponseElementForArray(resName,
>> -
>> objArray, service.isElementFormDefault());
>> + objArray, service.isElementFormDefault());
>> envelope.getBody().addChild(bodyChild);
>> } else {
>> - RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> - envelope, method,
>> service.isElementFormDefault());
>> + if (service.isElementFormDefault()) {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + service.getTypeTable());
>> + } else {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + null);
>> + }
>> }
>> }
>> outMessage.setEnvelope(envelope);
>> @@ -177,13 +183,13 @@
>> }
>> if (msg == null) {
>> msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> }
>> log.error(msg, e);
>> throw new AxisFault(msg);
>> } catch (Exception e) {
>> String msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> log.error(msg, e);
>> throw new AxisFault(msg, e);
>> }
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>> Tue Oct 24 04:59:52 2006
>> @@ -12,6 +12,7 @@
>> import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
>> import org.apache.axis2.databinding.utils.BeanUtil;
>> import org.apache.axis2.util.StreamWrapper;
>> +import org.apache.ws.java2wsdl.utils.TypeTable;
>>
>> import javax.xml.namespace.QName;
>> import javax.xml.stream.XMLStreamReader;
>> @@ -42,7 +43,9 @@
>> OMElement bodyContent,
>> OMNamespace ns,
>> SOAPEnvelope envelope,
>> - Method method, boolean
>> qualified) {
>> + Method method,
>> + boolean qualified ,
>> + TypeTable typeTable) {
>> if (resObject != null) {
>> //simple type
>> if (resObject instanceof OMElement) {
>> @@ -80,7 +83,7 @@
>> returnWrapper = new QName(RETURN_WRAPPER);
>> }
>> XMLStreamReader xr = BeanUtil.getPullParser(resObject,
>> - returnWrapper);
>> + returnWrapper , typeTable);
>> StAXOMBuilder stAXOMBuilder =
>> OMXMLBuilderFactory.createStAXOMBuilder(
>> OMAbstractFactory.getOMFactory(),
>> new StreamWrapper(xr));
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>> Tue Oct 24 04:59:52 2006
>> @@ -396,12 +396,6 @@
>> return complexType;
>> }
>>
>> -
>> - private String formGlobalElementName(String typeName) {
>> - String firstChar = typeName.substring(0, 1);
>> - return typeName.replaceFirst(firstChar,
>> firstChar.toLowerCase());
>> - }
>> -
>> private XmlSchema getXmlSchema(String targetNamespace) {
>> XmlSchema xmlSchema;
>>
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>> Tue Oct 24 04:59:52 2006
>> @@ -281,6 +281,7 @@
>> Collection schemas = schemaGenerator.generateSchema();
>> axisService.addSchema(schemas);
>>
>> axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
>>
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> if (Java2WSDLConstants.DEFAULT_TARGET_NAMESPACE.equals(
>> axisService.getTargetNamespace())) {
>>
>> axisService.setTargetNamespace(schemaGenerator.getTargetNamespace());
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>> Tue Oct 24 04:59:52 2006
>> @@ -180,6 +180,8 @@
>> // package to namespace mapping
>> private Map p2nMap;
>>
>> + private TypeTable typeTable;
>> +
>> public String getWSAddressingFlag() {
>> return wsaddressingFlag;
>> }
>> @@ -680,7 +682,7 @@
>> }
>> }
>>
>> - private void setPortAddress(Definition definition) throws
>> AxisFault{
>> + private void setPortAddress(Definition definition) throws
>> AxisFault {
>> Iterator serviceItr =
>> definition.getServices().values().iterator();
>> while (serviceItr.hasNext()) {
>> Service serviceElement = (Service) serviceItr.next();
>> @@ -690,8 +692,8 @@
>> List list = port.getExtensibilityElements();
>> for (int i = 0; i < list.size(); i++) {
>> Object extensibilityEle = list.get(i);
>> - if(extensibilityEle instanceof SOAPAddress) {
>> -
>> ((SOAPAddress)extensibilityEle).setLocationURI(getEPRs()[0]);
>> + if (extensibilityEle instanceof SOAPAddress) {
>> + ((SOAPAddress)
>> extensibilityEle).setLocationURI(getEPRs()[0]);
>> }
>> }
>> }
>> @@ -1329,6 +1331,7 @@
>> schemaGenerator.setExcludeMethods(excludeOpeartion);
>> axisService.addSchema(schemaGenerator.generateSchema());
>>
>> axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
>>
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> if (targetNamespace != null &&
>> !"".equals(targetNamespace)) {
>> axisService.setTargetNamespace(targetNamespace);
>> }
>> @@ -1446,6 +1449,8 @@
>> schemaGenerator.setExcludeMethods(excludeOpeartion);
>> axisService.addSchema(schemaGenerator.generateSchema());
>>
>> axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
>>
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> if (targetNameSpace != null &&
>> !"".equals(targetNameSpace)) {
>> axisService.setTargetNamespace(targetNameSpace);
>> }
>> @@ -1752,5 +1757,13 @@
>>
>> public void setObjectSupplier(ObjectSupplier objectSupplier) {
>> this.objectSupplier = objectSupplier;
>> + }
>> +
>> + public TypeTable getTypeTable() {
>> + return typeTable;
>> + }
>> +
>> + public void setTypeTable(TypeTable typeTable) {
>> + this.typeTable = typeTable;
>> }
>> }
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
>> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>>
>>
>
>
>
--
Thanks,
Deepal
................................................................
"The highest tower is built one brick at a time"
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r467316 - in /webservices/axis2/branches/java/1_1:
etc/ modules/adb/src/org/apache/axis2/databinding/utils/ modules/adb/src/org/apache/axis2/databinding/utils/reader/
modules/adb/src/org/apache/axis2/rpc/receivers/ modules/java2wsdl/src/org...
Posted by Deepal Jayasinghe <de...@opensource.lk>.
Hi Dennis;
I have changed my internal project.properties file since I couldnt able
to download those Jibx files. So I might have commit them w.o looking it
carefully. Im very sorry for that and will revert.
Thanks
Deepal
> Deepal, in this commit you changed JiBX back to the SNAPSHOT version
> from the 1.1.1 set of jars. Did you have some reason for doing this?
> If not, please correct this.
>
> Thanks,
>
> - Dennis
>
> Dennis M. Sosnoski
> SOA, Web Services, and XML
> Training and Consulting
> http://www.sosnoski.com - http://www.sosnoski.co.nz
> Seattle, WA +1-425-296-6194 - Wellington, NZ +64-4-298-6117
>
>
>
> deepal@apache.org wrote:
>
>> Author: deepal
>> Date: Tue Oct 24 04:59:52 2006
>> New Revision: 467316
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=467316
>> Log:
>> fixing 1440
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/etc/project.properties
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>>
>>
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>>
>>
>> Modified: webservices/axis2/branches/java/1_1/etc/project.properties
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/etc/project.properties?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> --- webservices/axis2/branches/java/1_1/etc/project.properties
>> (original)
>> +++ webservices/axis2/branches/java/1_1/etc/project.properties Tue
>> Oct 24 04:59:52 2006
>> @@ -108,7 +108,7 @@
>> jaxbri.version=2.0.2
>> jaxen.version=1.1-beta-10
>> jaxme.version=0.5.1
>> -jibx.version=1.1.1
>> +jibx.version=SNAPSHOT
>> junit.version=3.8.2
>> maven.itest.plugin.version=1.0
>> opensaml.version=1.1
>>
>> 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=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> 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
>> Tue Oct 24 04:59:52 2006
>> @@ -29,6 +29,7 @@
>> import
>> org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
>> import org.apache.axis2.engine.ObjectSupplier;
>> import org.apache.axis2.util.StreamWrapper;
>> +import org.apache.ws.java2wsdl.utils.TypeTable;
>> import org.codehaus.jam.*;
>>
>> import javax.xml.namespace.QName;
>> @@ -53,7 +54,9 @@
>> * @param beanObject
>> * @param beanName
>> */
>> - public static XMLStreamReader getPullParser(Object beanObject,
>> QName beanName) {
>> + public static XMLStreamReader getPullParser(Object beanObject,
>> + QName beanName,
>> + TypeTable typeTable) {
>> try {
>> JamServiceFactory factory =
>> JamServiceFactory.getInstance();
>> JamServiceParams jam_service_parms =
>> factory.createServiceParams();
>> @@ -96,8 +99,12 @@
>> if (SimpleTypeMapper.isSimpleType(ptype)) {
>> Object value =
>> propDesc.getReadMethod().invoke(beanObject,
>> null);
>> - object.add(new QName(beanName.getNamespaceURI(),
>> - propDesc.getName(), beanName.getPrefix()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + 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,
>> @@ -105,15 +112,23 @@
>> 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()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + 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()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> object.add(o);
>> }
>> }
>> @@ -129,19 +144,32 @@
>> 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()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> object.add(o);
>> } else {
>> - object.add(new
>> QName(beanName.getNamespaceURI(),
>> - propDesc.getName(),
>> beanName.getPrefix()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> object.add(o);
>> }
>> }
>>
>> }
>> } else {
>> - object.add(new QName(propDesc.getName()));
>> + if (typeTable != null) {
>> +
>> object.add(typeTable.getQNamefortheType(ptype.getName()));
>> + } else {
>> + object.add(new
>> QName(beanName.getNamespaceURI(),
>> + propDesc.getName(),
>> beanName.getPrefix()));
>> + }
>> Object value =
>> propDesc.getReadMethod().invoke(beanObject,
>> null);
>> object.add(value);
>> @@ -170,7 +198,7 @@
>> className =
>> className.substring(className.lastIndexOf('.') + 1,
>> className.length());
>> }
>> - return getPullParser(beanObject, new QName(className));
>> + return getPullParser(beanObject, new QName(className) , null);
>> }
>>
>> public static Object deserialize(Class beanClass,
>> @@ -300,7 +328,7 @@
>> String refId =
>> MultirefHelper.getAttvalue(attr);
>> partObj = helper.getObject(refId);
>> if (partObj == null) {
>> - partObj = helper.processRef(parameters,
>> refId , objectSupplier);
>> + partObj = helper.processRef(parameters,
>> refId, objectSupplier);
>> }
>> } else {
>> partObj =
>> SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
>> @@ -479,7 +507,7 @@
>> if (helper.getObject(ref) != null) {
>> return helper.getObject(ref);
>> } else {
>> - return helper.processRef(classType, ref ,
>> objectSupplier);
>> + return helper.processRef(classType, ref,
>> objectSupplier);
>> }
>> } else {
>> OMAttribute attribute = omElement.getAttribute(
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
>> Tue Oct 24 04:59:52 2006
>> @@ -934,7 +934,7 @@
>> //the thing as a bean and try generating events from it
>> childReader = new WrappingXMLStreamReader
>> (BeanUtil.getPullParser(propertyValue,
>> - propertyQName));
>> + propertyQName, null));
>> //we cannot register the namespace context here
>> }
>>
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
>> Tue Oct 24 04:59:52 2006
>> @@ -25,7 +25,6 @@
>> import org.apache.axis2.description.AxisMessage;
>> import org.apache.axis2.description.AxisOperation;
>> import org.apache.axis2.description.AxisService;
>> -import org.apache.axis2.engine.DependencyManager;
>> import org.apache.axis2.receivers.AbstractInOutAsyncMessageReceiver;
>> import org.apache.axis2.wsdl.WSDLConstants;
>> import org.apache.commons.logging.Log;
>> @@ -107,7 +106,7 @@
>> }
>>
>> Object[] objectArray =
>> RPCUtil.processRequest(methodElement,
>> - method
>> ,inMessage.getAxisService().getObjectSupplier());
>> + method,
>> inMessage.getAxisService().getObjectSupplier());
>> resObject = method.invoke(obj, objectArray);
>> }
>>
>> @@ -149,8 +148,16 @@
>> objArray, service.isElementFormDefault());
>> envelope.getBody().addChild(bodyChild);
>> } else {
>> - RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> - envelope, method,
>> service.isElementFormDefault());
>> + if (service.isElementFormDefault()) {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + service.getTypeTable());
>> + } else {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + null);
>> + }
>> +
>> }
>> }
>> outMessage.setEnvelope(envelope);
>> @@ -161,13 +168,13 @@
>> }
>> if (msg == null) {
>> msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> }
>> log.error(msg, e);
>> throw new AxisFault(msg);
>> } catch (Exception e) {
>> String msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> log.error(msg, e);
>> throw new AxisFault(msg, e);
>> }
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
>> Tue Oct 24 04:59:52 2006
>> @@ -30,7 +30,6 @@
>> import org.apache.axis2.description.AxisMessage;
>> import org.apache.axis2.description.AxisOperation;
>> import org.apache.axis2.description.AxisService;
>> -import org.apache.axis2.engine.DependencyManager;
>> import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
>> import org.apache.axis2.wsdl.WSDLConstants;
>> import org.apache.commons.logging.Log;
>> @@ -38,8 +37,8 @@
>>
>> import javax.xml.namespace.QName;
>> import java.lang.reflect.Array;
>> -import java.lang.reflect.Method;
>> import java.lang.reflect.InvocationTargetException;
>> +import java.lang.reflect.Method;
>>
>> public class RPCMessageReceiver extends
>> AbstractInOutSyncMessageReceiver {
>>
>> @@ -103,20 +102,20 @@
>> if (messageNameSpace != null) {
>> if (namespace == null) {
>> throw new AxisFault("namespace mismatch
>> require " +
>> - messageNameSpace +
>> - " found none");
>> + messageNameSpace +
>> + " found none");
>> }
>> if
>> (!messageNameSpace.equals(namespace.getNamespaceURI())) {
>> throw new AxisFault("namespace mismatch
>> require " +
>> - messageNameSpace +
>> - " found " +
>> methodElement.getNamespace().getNamespaceURI());
>> + messageNameSpace +
>> + " found " +
>> methodElement.getNamespace().getNamespaceURI());
>> }
>> } else if (namespace != null) {
>> throw new AxisFault("namespace mismatch.
>> Axis Oepration expects non-namespace " +
>> - "qualified element. But
>> received a namespace qualified element");
>> + "qualified element. But received a
>> namespace qualified element");
>> }
>>
>> - Object[] objectArray =
>> RPCUtil.processRequest(methodElement, method ,
>> + Object[] objectArray =
>> RPCUtil.processRequest(methodElement, method,
>>
>> inMessage.getAxisService().getObjectSupplier());
>> resObject = method.invoke(obj, objectArray);
>> }
>> @@ -133,16 +132,16 @@
>> }
>>
>> OMNamespace ns = fac.createOMNamespace(messageNameSpace,
>> -
>> service.getSchematargetNamespacePrefix());
>> + service.getSchematargetNamespacePrefix());
>> SOAPEnvelope envelope = fac.getDefaultEnvelope();
>> OMElement bodyContent = null;
>>
>> if (resObject instanceof Object[]) {
>> QName resName = new
>> QName(service.getSchematargetNamespace(),
>> - method.getName() +
>> "Response",
>> -
>> service.getSchematargetNamespacePrefix());
>> + method.getName() + "Response",
>> + service.getSchematargetNamespacePrefix());
>> OMElement bodyChild =
>> RPCUtil.getResponseElement(resName,
>> -
>> (Object[]) resObject, service.isElementFormDefault());
>> + (Object[]) resObject,
>> service.isElementFormDefault());
>> envelope.getBody().addChild(bodyChild);
>> } else {
>> if (resObject.getClass().isArray()) {
>> @@ -159,14 +158,21 @@
>> }
>>
>> QName resName = new
>> QName(service.getSchematargetNamespace(),
>> - method.getName() +
>> "Response",
>> -
>> service.getSchematargetNamespacePrefix());
>> + method.getName() + "Response",
>> + service.getSchematargetNamespacePrefix());
>> OMElement bodyChild =
>> RPCUtil.getResponseElementForArray(resName,
>> -
>> objArray, service.isElementFormDefault());
>> + objArray, service.isElementFormDefault());
>> envelope.getBody().addChild(bodyChild);
>> } else {
>> - RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> - envelope, method,
>> service.isElementFormDefault());
>> + if (service.isElementFormDefault()) {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + service.getTypeTable());
>> + } else {
>> + RPCUtil.processResponse(fac, resObject,
>> bodyContent, ns,
>> + envelope, method,
>> service.isElementFormDefault(),
>> + null);
>> + }
>> }
>> }
>> outMessage.setEnvelope(envelope);
>> @@ -177,13 +183,13 @@
>> }
>> if (msg == null) {
>> msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> }
>> log.error(msg, e);
>> throw new AxisFault(msg);
>> } catch (Exception e) {
>> String msg = "Exception occurred while trying to invoke
>> service method " +
>> - method.getName();
>> + method.getName();
>> log.error(msg, e);
>> throw new AxisFault(msg, e);
>> }
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
>> Tue Oct 24 04:59:52 2006
>> @@ -12,6 +12,7 @@
>> import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
>> import org.apache.axis2.databinding.utils.BeanUtil;
>> import org.apache.axis2.util.StreamWrapper;
>> +import org.apache.ws.java2wsdl.utils.TypeTable;
>>
>> import javax.xml.namespace.QName;
>> import javax.xml.stream.XMLStreamReader;
>> @@ -42,7 +43,9 @@
>> OMElement bodyContent,
>> OMNamespace ns,
>> SOAPEnvelope envelope,
>> - Method method, boolean
>> qualified) {
>> + Method method,
>> + boolean qualified ,
>> + TypeTable typeTable) {
>> if (resObject != null) {
>> //simple type
>> if (resObject instanceof OMElement) {
>> @@ -80,7 +83,7 @@
>> returnWrapper = new QName(RETURN_WRAPPER);
>> }
>> XMLStreamReader xr = BeanUtil.getPullParser(resObject,
>> - returnWrapper);
>> + returnWrapper , typeTable);
>> StAXOMBuilder stAXOMBuilder =
>> OMXMLBuilderFactory.createStAXOMBuilder(
>> OMAbstractFactory.getOMFactory(),
>> new StreamWrapper(xr));
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
>> Tue Oct 24 04:59:52 2006
>> @@ -396,12 +396,6 @@
>> return complexType;
>> }
>>
>> -
>> - private String formGlobalElementName(String typeName) {
>> - String firstChar = typeName.substring(0, 1);
>> - return typeName.replaceFirst(firstChar,
>> firstChar.toLowerCase());
>> - }
>> -
>> private XmlSchema getXmlSchema(String targetNamespace) {
>> XmlSchema xmlSchema;
>>
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
>> Tue Oct 24 04:59:52 2006
>> @@ -281,6 +281,7 @@
>> Collection schemas = schemaGenerator.generateSchema();
>> axisService.addSchema(schemas);
>>
>> axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
>>
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> if (Java2WSDLConstants.DEFAULT_TARGET_NAMESPACE.equals(
>> axisService.getTargetNamespace())) {
>>
>> axisService.setTargetNamespace(schemaGenerator.getTargetNamespace());
>>
>> Modified:
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>>
>> URL:
>> http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=467316&r1=467315&r2=467316
>>
>> ==============================================================================
>>
>> ---
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>> (original)
>> +++
>> webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
>> Tue Oct 24 04:59:52 2006
>> @@ -180,6 +180,8 @@
>> // package to namespace mapping
>> private Map p2nMap;
>>
>> + private TypeTable typeTable;
>> +
>> public String getWSAddressingFlag() {
>> return wsaddressingFlag;
>> }
>> @@ -680,7 +682,7 @@
>> }
>> }
>>
>> - private void setPortAddress(Definition definition) throws
>> AxisFault{
>> + private void setPortAddress(Definition definition) throws
>> AxisFault {
>> Iterator serviceItr =
>> definition.getServices().values().iterator();
>> while (serviceItr.hasNext()) {
>> Service serviceElement = (Service) serviceItr.next();
>> @@ -690,8 +692,8 @@
>> List list = port.getExtensibilityElements();
>> for (int i = 0; i < list.size(); i++) {
>> Object extensibilityEle = list.get(i);
>> - if(extensibilityEle instanceof SOAPAddress) {
>> -
>> ((SOAPAddress)extensibilityEle).setLocationURI(getEPRs()[0]);
>> + if (extensibilityEle instanceof SOAPAddress) {
>> + ((SOAPAddress)
>> extensibilityEle).setLocationURI(getEPRs()[0]);
>> }
>> }
>> }
>> @@ -1329,6 +1331,7 @@
>> schemaGenerator.setExcludeMethods(excludeOpeartion);
>> axisService.addSchema(schemaGenerator.generateSchema());
>>
>> axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
>>
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> if (targetNamespace != null &&
>> !"".equals(targetNamespace)) {
>> axisService.setTargetNamespace(targetNamespace);
>> }
>> @@ -1446,6 +1449,8 @@
>> schemaGenerator.setExcludeMethods(excludeOpeartion);
>> axisService.addSchema(schemaGenerator.generateSchema());
>>
>> axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
>>
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> + axisService.setTypeTable(schemaGenerator.getTypeTable());
>> if (targetNameSpace != null &&
>> !"".equals(targetNameSpace)) {
>> axisService.setTargetNamespace(targetNameSpace);
>> }
>> @@ -1752,5 +1757,13 @@
>>
>> public void setObjectSupplier(ObjectSupplier objectSupplier) {
>> this.objectSupplier = objectSupplier;
>> + }
>> +
>> + public TypeTable getTypeTable() {
>> + return typeTable;
>> + }
>> +
>> + public void setTypeTable(TypeTable typeTable) {
>> + this.typeTable = typeTable;
>> }
>> }
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
>> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>>
>>
>
>
>
--
Thanks,
Deepal
................................................................
"The highest tower is built one brick at a time"
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org