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/04/25 13:04:20 UTC
svn commit: r396839 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/DeploymentEngine.java description/WSDL2AxisServiceBuilder.java
Author: deepal
Date: Tue Apr 25 04:04:15 2006
New Revision: 396839
URL: http://svn.apache.org/viewcvs?rev=396839&view=rev
Log:
- when there is a wsdl file , generated axisService has few problem in there operation
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=396839&r1=396838&r2=396839&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Apr 25 04:04:15 2006
@@ -19,7 +19,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.deployment.repository.util.ArchiveFileData;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.deployment.repository.util.WSInfo;
@@ -32,6 +31,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -598,6 +598,17 @@
try {
HashMap wsdlservice = archiveReader.processWSDLs(currentArchiveFile,
this);
+ if (wsdlservice != null && wsdlservice.size() > 0) {
+ Iterator services = wsdlservice.values().iterator();
+ while (services.hasNext()) {
+ AxisService service = (AxisService) services.next();
+ Iterator operations = service.getOperations();
+ while (operations.hasNext()) {
+ AxisOperation axisOperation = (AxisOperation) operations.next();
+ phasesinfo.setOperationPhases(axisOperation);
+ }
+ }
+ }
AxisServiceGroup sericeGroup = new AxisServiceGroup(axisConfig);
sericeGroup.setServiceGroupClassLoader(
currentArchiveFile.getClassLoader());
@@ -637,8 +648,8 @@
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
- } catch(Throwable t) {
- if (log.isInfoEnabled()) {
+ } catch (Throwable t) {
+ if (log.isInfoEnabled()) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java?rev=396839&r1=396838&r2=396839&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java Tue Apr 25 04:04:15 2006
@@ -9,7 +9,6 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PolicyConstants;
import org.apache.ws.policy.PolicyReference;
@@ -19,7 +18,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
import javax.wsdl.*;
import javax.wsdl.extensions.ExtensibilityElement;
@@ -30,8 +28,8 @@
import javax.wsdl.extensions.soap.SOAPHeader;
import javax.wsdl.extensions.soap.SOAPOperation;
import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
import javax.wsdl.xml.WSDLLocator;
+import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -170,6 +168,7 @@
/**
* Sets a custom xmlschema resolver
+ *
* @param customResolver
*/
public void setCustomResolver(URIResolver customResolver) {
@@ -178,6 +177,7 @@
/**
* sets a custem WSDL4J locator
+ *
* @param customWSLD4JResolver
*/
public void setCustomWSLD4JResolver(WSDLLocator customWSLD4JResolver) {
@@ -941,7 +941,7 @@
if (baseUri != null) schemaCollection.setBaseUri(baseUri);
- if (customResolver!=null){
+ if (customResolver != null) {
schemaCollection.setSchemaResolver(customResolver);
}
@@ -951,9 +951,9 @@
private Definition readInTheWSDLFile(InputStream in) throws WSDLException {
WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
- if (customWSLD4JResolver!=null){
- return reader.readWSDL(customWSLD4JResolver);
- }else{
+ if (customWSLD4JResolver != null) {
+ return reader.readWSDL(customWSLD4JResolver);
+ } else {
reader.setFeature("javax.wsdl.importDocuments", false);
Document doc;