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 2006/12/22 15:03:11 UTC
svn commit: r489657 - in /webservices/axis2/branches/java/1_1/modules:
adb-codegen/src/org/apache/axis2/schema/
kernel/src/org/apache/axis2/description/
kernel/src/org/apache/axis2/transport/http/
Author: dims
Date: Fri Dec 22 06:03:10 2006
New Revision: 489657
URL: http://svn.apache.org/viewvc?view=rev&rev=489657
Log:
revised version of r489578 (deepal, please cross-check)
Modified:
webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=489657&r1=489656&r2=489657
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Fri Dec 22 06:03:10 2006
@@ -658,7 +658,7 @@
//set a name
referenceSchemaType.setName(generatedTypeName.getLocalPart());
- writeComplexType((XmlSchemaComplexType)referenceSchemaType,
+ String javaclassName = writeComplexType((XmlSchemaComplexType) referenceSchemaType,
(BeanWriterMetaInfoHolder)processedAnonymousComplexTypesMap.get(referencedElement)
);
//remove the reference from the anon list since we named the type
@@ -667,10 +667,8 @@
//processedAnonymousComplexTypesMap.remove(referencedElement);
- //add this to the processed ref type map
- String fullyQualifiedClassName = writer.makeFullyQualifiedClassName(generatedTypeName);
- processedTypemap.put(generatedTypeName, fullyQualifiedClassName);
- this.processedElementRefMap.put(referenceEltQName, fullyQualifiedClassName);
+ processedTypemap.put(generatedTypeName, javaclassName);
+ this.processedElementRefMap.put(referenceEltQName, javaclassName);
}
}
// schema type name is present but not the schema type object
@@ -930,10 +928,11 @@
* @param fullyQualifiedClassName the name returned by makeFullyQualifiedClassName() or null if it wasn't called
* @throws SchemaCompilationException
*/
- private void writeComplexType(XmlSchemaComplexType complexType, BeanWriterMetaInfoHolder metaInfHolder)
+ private String writeComplexType(XmlSchemaComplexType complexType, BeanWriterMetaInfoHolder metaInfHolder)
throws SchemaCompilationException {
- writer.write(complexType, processedTypemap, metaInfHolder);
+ String javaClassName = writer.write(complexType, processedTypemap, metaInfHolder);
processedTypeMetaInfoMap.put(complexType.getQName(),metaInfHolder);
+ return javaClassName;
}
/**
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=489657&r1=489656&r2=489657
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Fri Dec 22 06:03:10 2006
@@ -536,22 +536,12 @@
faultMessages.add(faultMessage);
}
- public String getSoapAction() {
- return soapAction;
- }
-
public void setSoapAction(String soapAction) {
this.soapAction = soapAction;
}
public String getInputAction() {
- String result = this.soapAction;
- if (result == null || "".equals(result)) {
- if (wsamappingList != null && !wsamappingList.isEmpty()) {
- result = wsamappingList.get(0).toString();
- }
- }
- return result;
+ return soapAction;
}
public String getOutputAction() {
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=489657&r1=489656&r2=489657
==============================================================================
--- 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 Fri Dec 22 06:03:10 2006
@@ -381,7 +381,7 @@
axisOperation.setMessageReceiver(
loadDefaultMessageReceiver(axisOperation.getMessageExchangePattern(), this));
}
- if (axisOperation.getSoapAction() == null) {
+ if (axisOperation.getInputAction() == null) {
axisOperation.setSoapAction("urn:" + axisOperation.getName().getLocalPart());
}
addChild(axisOperation);
@@ -406,7 +406,7 @@
mapActionToOperation(operationName, axisOperation);
- String action = axisOperation.getSoapAction();
+ String action = axisOperation.getInputAction();
if (action.length() > 0) {
mapActionToOperation(action, axisOperation);
}
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=489657&r1=489656&r2=489657
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Fri Dec 22 06:03:10 2006
@@ -298,7 +298,7 @@
soapActionString = messageContext.getWSAAction();
if (messageContext.getAxisOperation() != null && ((soapActionString == null) || (soapActionString.length() == 0))) {
// last option is to get it from the axis operation
- soapActionString = messageContext.getAxisOperation().getSoapAction();
+ soapActionString = messageContext.getAxisOperation().getInputAction();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org