Author: midon
Date: Wed Feb 25 21:54:59 2009
New Revision: 747932
URL: http://svn.apache.org/viewvc?rev=747932&view=rev
Log:
ODE-517: DeploymentService Responses are not compliant with the wsdl
Modified:
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
ode/trunk/axis2/src/main/wsdl/deploy.wsdl
Modified:
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?rev=747932&r1=747931&r2=747932&view=diff
==============================================================================
---
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
(original)
+++
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
Wed Feb 25 21:54:59 2009
@@ -106,12 +106,12 @@
OMElement root = _client.buildMessage("getProcessPackage", new
String[] {"processId"},
new Object[] { _deployed.get(0) } );
OMElement result = sendToDeployment(root);
- assertEquals(_package, result.getText());
+ assertEquals(_package, result.getFirstElement().getText());
OMElement root2 = _client.buildMessage("getProcessPackage", new
String[] {"processId"},
new Object[] { _deployed.get(1) } );
OMElement result2 = sendToDeployment(root2);
- assertEquals(_package, result2.getText());
+ assertEquals(_package, result2.getFirstElement().getText());
}
@Test
@@ -192,7 +192,7 @@
_deployed.clear();
String pakage = null;
- Iterator iter = result.getChildElements();
+ Iterator iter = result.getFirstElement().getChildElements();
while (iter.hasNext()) {
OMElement e = (OMElement) iter.next();
if (e.getLocalName().equals("name")) {
Modified:
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java?rev=747932&r1=747931&r2=747932&view=diff
==============================================================================
---
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
(original)
+++
ode/trunk/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
Wed Feb 25 21:54:59 2009
@@ -204,7 +204,7 @@
// Deploy
OMElement res = sendToDeployment(root);
- _deployedName = res.getFirstChildWithName(new QName(null,
"name")).getText();
+ _deployedName = res.getFirstChildWithName(new QName(null,
"response")).getFirstChildWithName(new
QName("http://www.apache.org/ode/deployapi";, "name")).getText();
// Execute
URL svcUrl = new URL("http://localhost:8888/processes/DynMainService";);
Modified:
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java?rev=747932&r1=747931&r2=747932&view=diff
==============================================================================
---
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
(original)
+++
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
Wed Feb 25 21:54:59 2009
@@ -70,14 +70,16 @@
private static final Log __log =
LogFactory.getLog(DeploymentWebService.class);
private final OMNamespace _pmapi;
+ private final OMNamespace _deployapi;
private File _deployPath;
private DeploymentPoller _poller;
private ProcessStore _store;
-
-
+
+
public DeploymentWebService() {
_pmapi =
OMAbstractFactory.getOMFactory().createOMNamespace("http://www.apache.org/ode/pmapi","pmapi";);
+ _deployapi =
OMAbstractFactory.getOMFactory().createOMNamespace("http://www.apache.org/ode/deployapi","deployapi";);
}
public void enableService(AxisConfiguration axisConfig, BpelServer server,
ProcessStore store,
@@ -153,13 +155,13 @@
OMElement response =
factory.createOMElement("response", null);
if (__log.isDebugEnabled()) __log.debug("Deployed
package: "+dest.getName());
- OMElement d = factory.createOMElement("name", null);
+ OMElement d = factory.createOMElement("name",
_deployapi);
d.setText(dest.getName());
response.addChild(d);
for (QName pid : deployed) {
if (__log.isDebugEnabled()) __log.debug("Deployed
PID: "+pid);
- d = factory.createOMElement("id", null);
+ d = factory.createOMElement("id", _deployapi);
d.setText(pid);
response.addChild(d);
}
@@ -198,7 +200,7 @@
Collection<String> packageNames = _store.getPackages();
OMElement response =
factory.createOMElement("deployedPackages", null);
for (String name : packageNames) {
- OMElement nameElmt = factory.createOMElement(new
QName( "http://www.apache.org/ode/deployapi","name";));
+ OMElement nameElmt = factory.createOMElement("name",
_deployapi);
nameElmt.setText(name);
response.addChild(nameElmt);
}
@@ -208,11 +210,11 @@
List<QName> processIds =
_store.listProcesses(namePart.getText());
OMElement response = factory.createOMElement("processIds",
null);
for (QName qname : processIds) {
- OMElement nameElmt = factory.createOMElement("id",
null);
+ OMElement nameElmt = factory.createOMElement("id",
_deployapi);
nameElmt.setText(qname);
response.addChild(nameElmt);
}
- sendResponse(factory, messageContext,
"listProcessResponse", response);
+ sendResponse(factory, messageContext,
"listProcessesResponse", response);
} else if (operation.equals("getProcessPackage")) {
OMElement qnamePart =
messageContext.getEnvelope().getBody().getFirstElement().getFirstElement();
ProcessConf process =
_store.getProcessConfiguration(OMUtils.getTextAsQName(qnamePart));
@@ -288,4 +290,6 @@
out.close();
}
+
+
}
Modified: ode/trunk/axis2/src/main/wsdl/deploy.wsdl
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/wsdl/deploy.wsdl?rev=747932&r1=747931&r2=747932&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/wsdl/deploy.wsdl (original)
+++ ode/trunk/axis2/src/main/wsdl/deploy.wsdl Wed Feb 25 21:54:59 2009
@@ -43,9 +43,9 @@
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="processIds">
- <xsd:all>
- <xsd:element name="id" type="xsd:QName" />
- </xsd:all>
+ <xsd:sequence>
+ <xsd:element name="id" type="xsd:QName" minOccurs="0"
maxOccurs="unbounded" />
+ </xsd:sequence>
</xsd:complexType>
<xsd:complexType name="deployUnit">
<xsd:sequence>
