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 2005/10/06 14:54:26 UTC
svn commit: r306618 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/ServiceBuilder.java deployment/repository/util/ArchiveReader.java
description/OperationDescription.java description/ServiceDescription.java
Author: deepal
Date: Thu Oct 6 05:54:17 2005
New Revision: 306618
URL: http://svn.apache.org/viewcvs?rev=306618&view=rev
Log: (empty)
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=306618&r1=306617&r2=306618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Oct 6 05:54:17 2005
@@ -27,6 +27,7 @@
import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.wsdl.WSDLOperation;
import org.apache.wsdl.WSDLConstants;
+import org.apache.wsdl.impl.WSDLOperationImpl;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLOutputFactory;
@@ -141,7 +142,7 @@
} catch (XMLStreamException e) {
throw new DeploymentException(e);
} catch (AxisFault axisFault) {
- throw new DeploymentException("Error in preocessing operation +" + axisFault);
+ throw new DeploymentException("Error in preocessing operation +" + axisFault);
}
}
@@ -157,31 +158,40 @@
throw new DeploymentException(Messages.getMessage("Invalide Operations"));
}
- //setting the mep of the operation
+ //setting the mep of the operation
OMAttribute op_mep_att = operation.getAttribute(
new QName(MEP));
- String mepurl =null;
+ String mepurl =null;
if(op_mep_att !=null){
mepurl = op_mep_att.getValue();
//todo value has to be validate
- //todo
+ //todo
// op_descrip.setMessageExchangePattern(mep);
}
String opname = op_name_att.getValue();
- WSDLOperation wsdlOperation =service.getWSDLOPOperation(new QName(opname));
+ WSDLOperation wsdlOperation =service.getWSDLOPOperation(new QName(opname));
// OperationDescription op_descrip = service.getOperation(new QName(opname));
OperationDescription op_descrip = null;
if(wsdlOperation == null){
if(mepurl == null){
- // assumed MEP is in-out
- op_descrip = new InOutOperationDescrition();
+ // assumed MEP is in-out
+ op_descrip = new InOutOperationDescrition();
} else {
op_descrip =OperationDescriptionFactory.getOperetionDescription(mepurl);
}
// op_descrip = new OperationDescription();
op_descrip.setName(new QName(opname));
log.info(Messages.getMessage(DeploymentErrorMsgs.OP_NOT_FOUN_IN_WSDL, opname));
+ } else {
+ //craeting opeartion from existing opeartion
+ String mep = wsdlOperation.getMessageExchangePattern();
+ if(mep == null) {
+ op_descrip = new InOutOperationDescrition(wsdlOperation);
+ } else {
+ op_descrip =OperationDescriptionFactory.getOperetionDescription(mep);
+ op_descrip.setWsdlopeartion((WSDLOperationImpl)wsdlOperation);
+ }
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=306618&r1=306617&r2=306618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Thu Oct 6 05:54:17 2005
@@ -105,6 +105,16 @@
WSDLVersionWrapper wsdlVersionWrapper = builder.build(in,
new AxisDescWSDLComponentFactory());
WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
+
+ //removing binding
+// Map bindings = wsdlVersionWrapper.getDefinition().getBindings();
+// Iterator binfingIterator = bindings.keySet().iterator();
+// while (binfingIterator.hasNext()) {
+// Object o = binfingIterator.next();
+// bindings.remove(o) ;
+//
+// }
+
Iterator iterator = womDescription.getServices().keySet()
.iterator();
if (iterator.hasNext()) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java?rev=306618&r1=306617&r2=306618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java Thu Oct 6 05:54:17 2005
@@ -61,6 +61,8 @@
//To store deploytime module refs
private ArrayList modulerefs;
+
+
public OperationDescription(WSDLOperation wsdlopeartion) {
this.wsdlopeartion = (WSDLOperationImpl)wsdlopeartion;
this.setMessageExchangePattern(MEP_URI_IN_OUT);
@@ -570,4 +572,7 @@
}
}
+ public void setWsdlopeartion(WSDLOperationImpl wsdlopeartion) {
+ this.wsdlopeartion = wsdlopeartion;
+ }
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java?rev=306618&r1=306617&r2=306618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java Thu Oct 6 05:54:17 2005
@@ -79,7 +79,7 @@
//to store module ref at deploy time parsing
private ArrayList mdoulesList = new ArrayList();
-
+
/**
* Constructor ServiceDescription
@@ -92,6 +92,7 @@
this.setComponentProperty(PARAMETER_KEY, new ParameterIncludeImpl());
this.setServiceInterface(new WSDLInterfaceImpl());
moduleConfigmap = new HashMap();
+
}
public ServiceDescription() {