Author: midon
Date: Thu Apr 23 23:19:52 2009
New Revision: 768093
URL: http://svn.apache.org/viewvc?rev=768093&view=rev
Log:
ODE-591: use the right namespaces
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?rev=768093&r1=768092&r2=768093&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
Thu Apr 23 23:19:52 2009
@@ -165,11 +165,11 @@
private String deploy(String packageName) throws Exception {
// Use the factory to create three elements
- OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI,
"deployapi");
- OMElement root = _factory.createOMElement("deploy", null);
- OMElement namePart = _factory.createOMElement("name", depns);
+ OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_DEPLOYAPI_NS, "deployapi");
+ OMElement root = _factory.createOMElement("deploy", depns);
+ OMElement namePart = _factory.createOMElement("name", null);
namePart.setText(packageName);
- OMElement zipPart = _factory.createOMElement("package", depns);
+ OMElement zipPart = _factory.createOMElement("package", null);
OMElement zipElmt = _factory.createOMElement("zip", depns);
// Add the zip to deploy
@@ -211,7 +211,7 @@
private void undeploy(String pakage) throws Exception {
// Prepare undeploy message
- OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI,
"deployapi");
+ OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_DEPLOYAPI_NS, "deployapi");
OMElement root = _factory.createOMElement("undeploy", depns);
OMElement part = _factory.createOMElement("packageName", null);
part.setText(pakage);
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java?rev=768093&r1=768092&r2=768093&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
Thu Apr 23 23:19:52 2009
@@ -103,8 +103,8 @@
public void ode_385_testGetInstanceInfo() throws Exception {
OMElement root = _client.buildMessage("listAllInstances", new String[]
{}, new String[] {});
OMElement result = sendToIM(root);
- String iid = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI, "instance-info"))
- .getFirstChildWithName(new QName(Namespaces.ODE_PMAPI,
"iid")).getText();
+ String iid = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_NS, "instance-info"))
+ .getFirstChildWithName(new QName(Namespaces.ODE_PMAPI_NS,
"iid")).getText();
root = _client.buildMessage("getInstanceInfo", new String[] {"iid"},
new String[] {iid});
result = sendToIM(root);
assert(result.toString().split("instance-info").length == 3);
@@ -128,8 +128,8 @@
OMElement root = _client.buildMessage("listInstances", new String[]
{"filter", "order", "limit"},
new String[] {"name=DynPartnerMain", "", "10"});
OMElement result = sendToIM(root);
- String siid = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI, "instance-info"))
- .getFirstChildWithName(new QName(Namespaces.ODE_PMAPI,
"root-scope"))
+ String siid = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_TYPES_NS, "instance-info"))
+ .getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_TYPES_NS, "root-scope"))
.getAttributeValue(new QName(null, "siid"));
root = _client.buildMessage("getScopeInfoWithActivity", new String[]
{"siid", "activityInfo"},
new String[] {siid, "true"});
@@ -143,8 +143,8 @@
OMElement root = _client.buildMessage("listInstances", new String[]
{"filter", "order", "limit"},
new String[] {"name=DynPartnerMain", "", "10"});
OMElement result = sendToIM(root);
- String siid = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI, "instance-info"))
- .getFirstChildWithName(new QName(Namespaces.ODE_PMAPI,
"root-scope"))
+ String siid = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_TYPES_NS, "instance-info"))
+ .getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_TYPES_NS, "root-scope"))
.getAttributeValue(new QName(null, "siid"));
root = _client.buildMessage("getVariableInfo", new String[] {"sid",
"varName"}, new String[] {siid, "dummy"});
result = sendToIM(root);
@@ -187,11 +187,11 @@
_client = new ServiceClientUtil();
// Use the factory to create three elements
- OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI,
"deployapi");
- OMElement root = _factory.createOMElement("deploy", null);
- OMElement namePart = _factory.createOMElement("name", depns);
+ OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_DEPLOYAPI_NS, "deployapi");
+ OMElement root = _factory.createOMElement("deploy", depns);
+ OMElement namePart = _factory.createOMElement("name", null);
namePart.setText("DynPartner");
- OMElement zipPart = _factory.createOMElement("package", depns);
+ OMElement zipPart = _factory.createOMElement("package", null);
OMElement zipElmt = _factory.createOMElement("zip", depns);
// Add the zip to deploy
@@ -222,7 +222,7 @@
@AfterMethod
protected void tearDown() throws Exception {
// Prepare undeploy message
- OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI,
"deployapi");
+ OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_DEPLOYAPI_NS, "deployapi");
OMElement root = _factory.createOMElement("undeploy", depns);
OMElement part = _factory.createOMElement("package", null);
part.setText(_deployedName);
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java?rev=768093&r1=768092&r2=768093&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
Thu Apr 23 23:19:52 2009
@@ -89,7 +89,7 @@
_client = new ServiceClientUtil();
// Use the factory to create three elements
- OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_PMAPI_NS, "deployapi");
+ OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_DEPLOYAPI_NS, "deployapi");
OMElement root = _factory.createOMElement("deploy", depns);
OMElement namePart = _factory.createOMElement("name", null);
namePart.setText("DynPartner");
@@ -122,7 +122,7 @@
protected void tearDown() throws Exception {
// Prepare undeploy message
- OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_PMAPI_NS, "deployapi");
+ OMNamespace depns =
_factory.createOMNamespace(Namespaces.ODE_DEPLOYAPI_NS, "deployapi");
OMElement root = _factory.createOMElement("undeploy", depns);
OMElement part = _factory.createOMElement("packageName", null);
part.setText("DynPartner");
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java?rev=768093&r1=768092&r2=768093&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
Thu Apr 23 23:19:52 2009
@@ -71,10 +71,10 @@
new String[] {"name=DynPartnerMain", ""});
OMElement result = sendToPM(listRoot);
ArrayList<String> filenames = new ArrayList<String>();
- Iterator docs = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI, "documents")).getChildElements();
+ Iterator docs = result.getFirstElement().getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_TYPES_NS, "documents")).getChildElements();
while (docs.hasNext()) {
OMElement docElmt = (OMElement) docs.next();
- filenames.add(docElmt.getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI, "name")).getText());
+ filenames.add(docElmt.getFirstChildWithName(new
QName(Namespaces.ODE_PMAPI_TYPES_NS, "name")).getText());
}
// Checking that all necessary files are really there
assertTrue(filenames.contains("DynPartnerMain.bpel"));
