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 am...@apache.org on 2007/07/01 09:33:42 UTC
svn commit: r552257 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
Author: amilas
Date: Sun Jul 1 00:33:41 2007
New Revision: 552257
URL: http://svn.apache.org/viewvc?view=rev&rev=552257
Log:
fixed some issue with multi service code gen
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=552257&r1=552256&r2=552257
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Sun Jul 1 00:33:41 2007
@@ -185,7 +185,10 @@
protected static final Log log = LogFactory.getLog(AxisServiceBasedMultiLanguageEmitter.class);
protected URIResolver resolver;
+ // this is used to keep the current service infoHolder
protected Map infoHolder;
+ // this is used to keep infoHolders for all services
+ protected Map allServiceInfoHolder;
protected CodeGenConfiguration codeGenConfiguration;
@@ -210,6 +213,7 @@
*/
public AxisServiceBasedMultiLanguageEmitter() {
infoHolder = new HashMap();
+ allServiceInfoHolder = new HashMap();
}
/**
@@ -1266,10 +1270,13 @@
try {
+ allServiceInfoHolder = new HashMap();
Map originalMap = getNewCopy(this.mapper.getAllMappedNames());
// we are going to generate following files seperately per service
for (Iterator axisServicesIter = this.axisServices.iterator();
axisServicesIter.hasNext();) {
+ // create a new hash map for each service
+ this.infoHolder = new HashMap();
this.axisService = (AxisService) axisServicesIter.next();
this.axisBinding =
axisService.getEndpoint(axisService.getEndpointName()).getBinding();
@@ -1316,6 +1323,8 @@
//we need to serialize the WSDL's
writeWSDLFiles();
}
+ // save the info holder with the service
+ allServiceInfoHolder.put(this.axisService.getName(),this.infoHolder);
}
// save back type map
@@ -1903,6 +1912,10 @@
* @return DOM Element
*/
protected Element getServiceElement(String serviceName, String className, Document doc) {
+
+ if (allServiceInfoHolder.get(serviceName) != null){
+ this.infoHolder = (Map) allServiceInfoHolder.get(serviceName);
+ }
Element rootElement = doc.createElement("interface");
addAttribute(doc, "package", "", rootElement);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java?view=diff&rev=552257&r1=552256&r2=552257
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java Sun Jul 1 00:33:41 2007
@@ -110,6 +110,8 @@
if (retAxisService != null) {
axisServices.add(retAxisService);
}
+ // reset the port name if it had set when moving to next service
+ portName = null;
}
} else {
throw new AxisFault("No service was not found in the WSDL at " +
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org