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 gd...@apache.org on 2007/03/22 22:01:50 UTC
svn commit: r521461 [2/2] - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/addressing/
integration/test/org/apache/axis2/addressing/
integration/test/org/apache/axis2/deployment/
integration/test/org/apache/axis2/engine/ inte...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Thu Mar 22 14:01:46 2007
@@ -211,12 +211,11 @@
module.setParent(this);
notifyObservers(AxisEvent.MODULE_DEPLOY, module);
- String moduleName = module.getName().getLocalPart();
+ String moduleName = module.getName();
if (moduleName.endsWith("SNAPSHOT")) {
- QName moduleQName = new QName(moduleName.substring(0, moduleName
- .indexOf("SNAPSHOT") - 1));
- module.setName(moduleQName);
- allModules.put(moduleQName, module);
+ moduleName = moduleName.substring(0, moduleName.indexOf("SNAPSHOT") - 1);
+ module.setName(moduleName);
+ allModules.put(moduleName, module);
} else {
allModules.put(module.getName(), module);
}
@@ -298,7 +297,7 @@
}
Iterator enModule = engagedModules.iterator();
while (enModule.hasNext()) {
- QName moduleName = (QName) enModule.next();
+ String moduleName = (String) enModule.next();
axisServiceGroup.engageModule(getModule(moduleName), this);
}
services = axisServiceGroup.getServices();
@@ -383,16 +382,29 @@
* the correct module. Both of the below two cases are valid 1.
* engageModule("addressing"); 2. engageModule("addressing-1.23");
*
- * @param moduleref
+ * @deprecate Please use the String version instead
+ * @param moduleref QName of module to engage
* @throws AxisFault
*/
public void engageModule(QName moduleref) throws AxisFault {
+ engageModule(moduleref.getLocalPart());
+ }
+
+ /**
+ * Engages the default module version corresponding to given module name ,
+ * or if the module name contains version number in it then it will engage
+ * the correct module. Both of the below two cases are valid 1.
+ * engageModule("addressing"); 2. engageModule("addressing-1.23");
+ *
+ * @param moduleref name of module to engage
+ * @throws AxisFault
+ */
+ public void engageModule(String moduleref) throws AxisFault {
AxisModule module = getModule(moduleref);
if (module != null) {
engageModule(module);
} else {
- throw new AxisFault(Messages.getMessage("modulenotavailble",
- moduleref.getLocalPart()));
+ throw new AxisFault(Messages.getMessage("modulenotavailble", moduleref));
}
}
@@ -405,8 +417,8 @@
*/
public void engageModule(String moduleName, String versionID)
throws AxisFault {
- QName moduleQName = Utils.getModuleName(moduleName, versionID);
- AxisModule module = getModule(moduleQName);
+ String actualName = Utils.getModuleName(moduleName, versionID);
+ AxisModule module = getModule(actualName);
if (module != null) {
engageModule(module);
} else {
@@ -422,12 +434,12 @@
private void engageModule(AxisModule module) throws AxisFault {
boolean isEngagable;
if (module != null) {
- QName moduleQName = module.getName();
+ String moduleName = module.getName();
for (Iterator iterator = engagedModules.iterator(); iterator
.hasNext();) {
- QName qName = (QName) iterator.next();
+ String thisModule = (String) iterator.next();
- isEngagable = Utils.checkVersion(moduleQName, qName);
+ isEngagable = Utils.checkVersion(moduleName, thisModule);
if (!isEngagable) {
return;
}
@@ -601,6 +613,16 @@
return (MessageFormatter) messageFormatters.get(contentType);
}
+// /**
+// *
+// * @deprecate Please use String version instead
+// * @param qname
+// * @return
+// */
+// public AxisModule getModule(QName qname) {
+// return getModule(qname.getLocalPart());
+// }
+
/**
* Method getModule. first it will check whether the given module is there
* in the hashMap , if so just return that and the name can be either with
@@ -612,14 +634,14 @@
* @param name
* @return Returns ModuleDescription.
*/
- public AxisModule getModule(QName name) {
+ public AxisModule getModule(String name) {
AxisModule module = (AxisModule) allModules.get(name);
if (module != null) {
return module;
}
// checking whether the version string seperator is not there in the
// module name
- String moduleName = name.getLocalPart();
+ String moduleName = name;
String defaultModuleVersion = getDefaultModuleVersion(moduleName);
if (defaultModuleVersion != null) {
module = (AxisModule) allModules.get(Utils.getModuleName(
@@ -636,7 +658,7 @@
return this.moduleClassLoader;
}
- public ModuleConfiguration getModuleConfig(QName moduleName) {
+ public ModuleConfiguration getModuleConfig(String moduleName) {
return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
@@ -761,10 +783,9 @@
return transportsOut;
}
- public boolean isEngaged(QName moduleName) {
+ public boolean isEngaged(String moduleName) {
boolean b = engagedModules.contains(moduleName);
- return b ? b : engagedModules.contains(this.getDefaultModule(
- moduleName.getLocalPart()).getName());
+ return b ? b : engagedModules.contains(getDefaultModule(moduleName).getName());
}
public void setGlobalOutPhase(ArrayList outPhases) {
@@ -830,12 +851,11 @@
}
public AxisModule getDefaultModule(String moduleName) {
- String defualtModuleVersion = getDefaultModuleVersion(moduleName);
- if (defualtModuleVersion == null) {
- return (AxisModule) allModules.get(new QName(moduleName));
+ String defaultModuleVersion = getDefaultModuleVersion(moduleName);
+ if (defaultModuleVersion == null) {
+ return (AxisModule) allModules.get(moduleName);
} else {
- return (AxisModule) allModules.get(new QName(moduleName + "-"
- + defualtModuleVersion));
+ return (AxisModule) allModules.get(moduleName + "-" + defaultModuleVersion);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java Thu Mar 22 14:01:46 2007
@@ -269,7 +269,7 @@
if (moduleName != null) {
try {
- configContext.getAxisConfiguration().engageModule(new QName(moduleName));
+ configContext.getAxisConfiguration().engageModule(moduleName);
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName + " module engaged globally successfully");
} catch (AxisFault axisFault) {
@@ -314,7 +314,7 @@
serviceName).getOperation(new QName(operationName));
od.engageModule(
- configContext.getAxisConfiguration().getModule(new QName(moduleName)),
+ configContext.getAxisConfiguration().getModule(moduleName),
configContext.getAxisConfiguration());
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName
@@ -348,7 +348,7 @@
if ((serviceName != null) && (moduleName != null)) {
try {
configContext.getAxisConfiguration().getService(serviceName).engageModule(
- configContext.getAxisConfiguration().getModule(new QName(moduleName)),
+ configContext.getAxisConfiguration().getModule(moduleName),
configContext.getAxisConfiguration());
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName
@@ -384,7 +384,7 @@
if ((serviceName != null) && (moduleName != null)) {
configContext.getAxisConfiguration().getServiceGroup(serviceName).engageModule(
- configContext.getAxisConfiguration().getModule(new QName(moduleName)),
+ configContext.getAxisConfiguration().getModule(moduleName),
configContext.getAxisConfiguration());
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName
@@ -547,7 +547,7 @@
String moduleName = req.getParameter("module");
AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
AxisService service = axisConfiguration.getService(serviceName);
- AxisModule module = axisConfiguration.getModule(new QName(moduleName));
+ AxisModule module = axisConfiguration.getModule(moduleName);
if (type.equals("operation")) {
if (service.isEngaged(module.getName()) ||
axisConfiguration.isEngaged(module.getName())) {
@@ -567,7 +567,7 @@
.setAttribute("status", "Can not disengage module " + moduleName + ". " +
"This module is engaged at a higher level.");
} else {
- service.disengageModule(axisConfiguration.getModule(new QName(moduleName)));
+ service.disengageModule(axisConfiguration.getModule(moduleName));
req.getSession()
.setAttribute("status", "Module " + moduleName + " was disengaged from" +
" service " + serviceName + ".");
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java Thu Mar 22 14:01:46 2007
@@ -35,7 +35,6 @@
import java.io.OutputStream;
public class LocalTransportSender extends AbstractHandler implements TransportSender {
-
private ByteArrayOutputStream out;
private ByteArrayOutputStream response;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Thu Mar 22 14:01:46 2007
@@ -253,14 +253,14 @@
}
- public static QName getModuleName(String name, String versionID) {
+ public static String getModuleName(String name, String versionID) {
String moduleName;
if (versionID != null && versionID.length() != 0) {
moduleName = name + "-" + versionID;
} else {
moduleName = name;
}
- return new QName(moduleName);
+ return moduleName;
}
/**
@@ -273,12 +273,12 @@
* @param deployedModulename
* @throws AxisFault
*/
- public static boolean checkVersion(QName deployingModuleName,
- QName deployedModulename) throws AxisFault {
- String module1name = getModuleName(deployingModuleName.getLocalPart());
- String module2name = getModuleName(deployedModulename.getLocalPart());
- String module1version = getModuleVersion(deployingModuleName.getLocalPart());
- String module2version = getModuleVersion(deployedModulename.getLocalPart());
+ public static boolean checkVersion(String deployingModuleName,
+ String deployedModulename) throws AxisFault {
+ String module1name = getModuleName(deployingModuleName);
+ String module2name = getModuleName(deployedModulename);
+ String module1version = getModuleVersion(deployingModuleName);
+ String module2version = getModuleVersion(deployedModulename);
if (module1name.equals(module2name)) {
if (module1version != null) {
if (!module1version.equals(module2version)) {
@@ -300,9 +300,9 @@
HashMap defaultModules = new HashMap();
while (allModules.hasNext()) {
AxisModule axisModule = (AxisModule) allModules.next();
- QName moduleName = axisModule.getName();
- String moduleNameString = getModuleName(moduleName.getLocalPart());
- String moduleVersionString = getModuleVersion(moduleName.getLocalPart());
+ String moduleName = axisModule.getName();
+ String moduleNameString = getModuleName(moduleName);
+ String moduleVersionString = getModuleVersion(moduleName);
String currentDefaultVerison = (String) defaultModules.get(moduleNameString);
if (currentDefaultVerison != null) {
// if the module version is null then , that will be ignore in this case
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java Thu Mar 22 14:01:46 2007
@@ -36,8 +36,9 @@
QName opName = new QName("testOperation");
protected void setUp() throws Exception {
- String filename =
- System.getProperty("basedir") + "/test-resources/deployment/moduleDisEngegeRepo";
+// String filename =
+// System.getProperty("basedir") + "/test-resources/deployment/moduleDisEngegeRepo";
+ String filename = "./test-resources/deployment/moduleDisEngegeRepo";
er = ConfigurationContextFactory.
createConfigurationContextFromFileSystem(filename, null).getAxisConfiguration();
AxisService testService = new AxisService();
@@ -49,7 +50,7 @@
}
public void testGloalDisengagement() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
@@ -74,7 +75,7 @@
}
public void testServiceDisengagement() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
@@ -100,7 +101,7 @@
public void testGlobalChcek() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
er.engageModule(module.getName());
er.disengageModule(module);
@@ -108,7 +109,7 @@
}
public void testOperationDisengagement() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
@@ -133,7 +134,7 @@
}
public void testServiceEnageServiceDisengag() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
@@ -158,7 +159,7 @@
}
public void testServiceEnageOperationDisengag() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
@@ -183,7 +184,7 @@
}
public void testOperationEnageOperationDisengage() throws AxisFault {
- AxisModule module = er.getModule(new QName("testModule"));
+ AxisModule module = er.getModule("testModule");
assertNotNull(module);
Phase predisptah;
Phase userPhase;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java Thu Mar 22 14:01:46 2007
@@ -7,7 +7,6 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.Utils;
-import javax.xml.namespace.QName;
import java.util.Iterator;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -30,8 +29,7 @@
public class ModuleversionTest extends TestCase {
public void testDefautModuleVersion() throws AxisFault {
- String filename = System.getProperty("basedir") +
- "/test-resources/deployment/moduleVersion/Test1/axis2.xml";
+ String filename = "./test-resources/deployment/moduleVersion/Test1/axis2.xml";
AxisConfiguration ac =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, filename)
.getAxisConfiguration();
@@ -43,31 +41,31 @@
public void testCalculateDefaultModuleVersions() throws AxisFault {
AxisConfiguration axiConfiguration = new AxisConfiguration();
AxisModule module1 = new AxisModule();
- module1.setName(new QName("Module1"));
+ module1.setName("Module1");
axiConfiguration.addModule(module1);
AxisModule module2 = new AxisModule();
- module2.setName(new QName("Module2-0.94"));
+ module2.setName("Module2-0.94");
axiConfiguration.addModule(module2);
AxisModule module3 = new AxisModule();
- module3.setName(new QName("Module2-0.95"));
+ module3.setName("Module2-0.95");
axiConfiguration.addModule(module3);
AxisModule module4 = new AxisModule();
- module4.setName(new QName("Module2-0.93"));
+ module4.setName("Module2-0.93");
axiConfiguration.addModule(module4);
AxisModule module5 = new AxisModule();
- module5.setName(new QName("testModule-1.93"));
+ module5.setName("testModule-1.93");
axiConfiguration.addModule(module5);
Utils.calculateDefaultModuleVersion(axiConfiguration.getModules(), axiConfiguration);
assertEquals(module1, axiConfiguration.getDefaultModule("Module1"));
assertEquals(module3, axiConfiguration.getDefaultModule("Module2"));
assertEquals(module5, axiConfiguration.getDefaultModule("testModule"));
- axiConfiguration.engageModule(new QName("Module2"));
- axiConfiguration.engageModule(new QName("Module1"));
+ axiConfiguration.engageModule("Module2");
+ axiConfiguration.engageModule("Module1");
axiConfiguration.engageModule("testModule", "1.93");
Iterator engageModules = axiConfiguration.getEngagedModules().iterator();
@@ -75,22 +73,22 @@
boolean found2 = false;
boolean found3 = false;
while (engageModules.hasNext()) {
- QName qName = (QName) engageModules.next();
- if (qName.getLocalPart().equals("Module2-0.95")) {
+ String qName = (String) engageModules.next();
+ if (qName.equals("Module2-0.95")) {
found1 = true;
}
}
engageModules = axiConfiguration.getEngagedModules().iterator();
while (engageModules.hasNext()) {
- QName qName = (QName) engageModules.next();
- if (qName.getLocalPart().equals("Module1")) {
+ String name = (String) engageModules.next();
+ if (name.equals("Module1")) {
found2 = true;
}
}
engageModules = axiConfiguration.getEngagedModules().iterator();
while (engageModules.hasNext()) {
- QName qName = (QName) engageModules.next();
- if (qName.getLocalPart().equals("testModule-1.93")) {
+ String qName = (String) engageModules.next();
+ if (qName.equals("testModule-1.93")) {
found3 = true;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java Thu Mar 22 14:01:46 2007
@@ -45,7 +45,7 @@
}
public void testModule() throws AxisFault {
- AxisModule module = new AxisModule(new QName("module1"));
+ AxisModule module = new AxisModule("module1");
module.setParent(reg);
testParameteInClude(module);
testFlowIncludeTest(module);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java Thu Mar 22 14:01:46 2007
@@ -22,9 +22,6 @@
import java.lang.reflect.Field;
public class MessageContextChangeTest extends TestCase {
- private String testArg = null;
-
- private static String mc_package = "org.apache.axis2.context.MessageContext";
private FieldDescription[] knownList = {
new FieldDescription("org.apache.commons.logging.Log", "log"),
@@ -107,16 +104,15 @@
new FieldDescription("boolean", "inboundReset"),
new FieldDescription("boolean", "outboundReset"),
new FieldDescription("java.lang.String", "selfManagedDataDelimiter"),
- new FieldDescription("java.lang.Class",
- "class$org$apache$axis2$context$MessageContext"),
- new FieldDescription("java.lang.Class",
- "class$org$apache$axis2$context$SelfManagedDataManager"),
+// new FieldDescription("java.lang.Class",
+// "class$org$apache$axis2$context$MessageContext"),
+// new FieldDescription("java.lang.Class",
+// "class$org$apache$axis2$context$SelfManagedDataManager"),
};
public MessageContextChangeTest(String arg0) {
super(arg0);
- testArg = new String(arg0);
}
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java Thu Mar 22 14:01:46 2007
@@ -36,9 +36,8 @@
public class ModuleConfigTest extends TestCase {
AxisConfiguration ar;
- String axis2xml = System.getProperty("basedir") +
- "/target/test-resources/deployment/moduleConfig/axis2.xml";
- String repo = System.getProperty("basedir") + "/target/test-resources/deployment/moduleConfig";
+ String axis2xml = "./target/test-resources/deployment/moduleConfig/axis2.xml";
+ String repo = "./target/test-resources/deployment/moduleConfig";
public void testModuleConfigAtAxisConfig() {
@@ -47,13 +46,13 @@
.createConfigurationContextFromFileSystem(null, axis2xml)
.getAxisConfiguration();
ModuleConfiguration moduleConfiguration =
- ar.getModuleConfig(new QName("testModule"));
+ ar.getModuleConfig("testModule");
assertNotNull(moduleConfiguration);
Parameter para = moduleConfiguration.getParameter("testModulePara");
assertNotNull(para);
moduleConfiguration =
- ar.getModuleConfig(new QName("testModule2"));
+ ar.getModuleConfig("testModule2");
assertNotNull(moduleConfiguration);
para = moduleConfiguration.getParameter("testModulePara2");
assertNotNull(para);
@@ -78,7 +77,7 @@
sbuilder.populateService(sbuilder.buildOM());
ModuleConfiguration moduleConfiguration =
- service.getModuleConfig(new QName("Servie_module"));
+ service.getModuleConfig("Servie_module");
assertNotNull(moduleConfiguration);
Parameter para = moduleConfiguration.getParameter("Servie_module_para");
assertNotNull(para);
@@ -86,7 +85,7 @@
AxisOperation op = service.getOperation(new QName("echoString"));
assertNotNull(op);
- moduleConfiguration = op.getModuleConfig(new QName("Op_Module"));
+ moduleConfiguration = op.getModuleConfig("Op_Module");
assertNotNull(moduleConfiguration);
para = moduleConfiguration.getParameter("Op_Module_para");
assertNotNull(para);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java Thu Mar 22 14:01:46 2007
@@ -38,9 +38,9 @@
String filename = System.getProperty("basedir") + "/target/test-resources/deployment";
ac = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, null)
.getAxisConfiguration();
- AxisModule module = ac.getModule(new QName("module1"));
+ AxisModule module = ac.getModule("module1");
assertNotNull(module);
- ac.engageModule(new QName("module1"));
+ ac.engageModule("module1");
AxisService service = ac.getService("service2");
assertNotNull(service);
AxisOperation moduleOperation = service.getOperation(
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterAddTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterAddTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterAddTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterAddTest.java Thu Mar 22 14:01:46 2007
@@ -24,8 +24,6 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.Parameter;
-import javax.xml.namespace.QName;
-
/**
* To chcek locked is working corrcetly
*/
@@ -58,7 +56,7 @@
para.setName("PARA_NAME");
para.setLocked(true);
reg.addParameter(para);
- AxisModule module = new AxisModule(new QName("Service1"));
+ AxisModule module = new AxisModule("Service1");
module.setParent(reg);
module.addParameter(para);
fail("This should fails with Parmter is locked can not overide");
Modified: webservices/axis2/trunk/java/modules/samples/deprecated/sgccalculator/src/sample/sgccalculator/CalcClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/deprecated/sgccalculator/src/sample/sgccalculator/CalcClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/deprecated/sgccalculator/src/sample/sgccalculator/CalcClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/deprecated/sgccalculator/src/sample/sgccalculator/CalcClient.java Thu Mar 22 14:01:46 2007
@@ -104,7 +104,7 @@
System.out.println("Invoking...");
ServiceClient serviceClient = new ServiceClient();
- serviceClient.engageModule(new QName("addressing"));
+ serviceClient.engageModule("addressing");
serviceClient.setOptions(options);
options.setAction("urn:" + opStr);
MessageContext requetMessageContext = new MessageContext();
Modified: webservices/axis2/trunk/java/modules/samples/security/basic/sample11/src/org/apache/rampart/samples/sample11/Client.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/basic/sample11/src/org/apache/rampart/samples/sample11/Client.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/basic/sample11/src/org/apache/rampart/samples/sample11/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/security/basic/sample11/src/org/apache/rampart/samples/sample11/Client.java Thu Mar 22 14:01:46 2007
@@ -54,7 +54,7 @@
client.setOptions(options);
//Engage rampart
- client.engageModule(new QName("rampart"));
+ client.engageModule("rampart");
OMElement response = client.sendReceive(getPayload("Hello world"));
Modified: webservices/axis2/trunk/java/modules/samples/security/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/security/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java Thu Mar 22 14:01:46 2007
@@ -49,8 +49,8 @@
options.setProperty(RampartMessageData.KEY_RAMPART_POLICY, loadPolicy(args[2]));
client.setOptions(options);
- client.engageModule(new QName("addressing"));
- client.engageModule(new QName("rampart"));
+ client.engageModule("addressing");
+ client.engageModule("rampart");
OMElement response = client.sendReceive(getPayload("Hello world"));
Modified: webservices/axis2/trunk/java/modules/samples/security/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/security/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java Thu Mar 22 14:01:46 2007
@@ -49,9 +49,9 @@
options.setProperty(RampartMessageData.KEY_RAMPART_POLICY, loadPolicy(args[2]));
client.setOptions(options);
- client.engageModule(new QName("addressing"));
- client.engageModule(new QName("rampart"));
-
+ client.engageModule("addressing");
+ client.engageModule("rampart");
+
OMElement response = client.sendReceive(getPayload("Hello world"));
System.out.println(response);
Modified: webservices/axis2/trunk/java/modules/samples/security/policy/sample03/src/org/apache/rampart/samples/policy/sample03/Client.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/policy/sample03/src/org/apache/rampart/samples/policy/sample03/Client.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/policy/sample03/src/org/apache/rampart/samples/policy/sample03/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/security/policy/sample03/src/org/apache/rampart/samples/policy/sample03/Client.java Thu Mar 22 14:01:46 2007
@@ -49,9 +49,9 @@
options.setProperty(RampartMessageData.KEY_RAMPART_POLICY, loadPolicy(args[2]));
client.setOptions(options);
- client.engageModule(new QName("addressing"));
- client.engageModule(new QName("rampart"));
-
+ client.engageModule("addressing");
+ client.engageModule("rampart");
+
OMElement response = client.sendReceive(getPayload("Hello world"));
System.out.println(response);
Modified: webservices/axis2/trunk/java/modules/samples/security/policy/sample04/src/org/apache/rampart/samples/policy/sample04/Client.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/security/policy/sample04/src/org/apache/rampart/samples/policy/sample04/Client.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/security/policy/sample04/src/org/apache/rampart/samples/policy/sample04/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/security/policy/sample04/src/org/apache/rampart/samples/policy/sample04/Client.java Thu Mar 22 14:01:46 2007
@@ -50,9 +50,9 @@
options.setProperty(RampartMessageData.KEY_RAMPART_POLICY, loadPolicy(args[2]));
client.setOptions(options);
- client.engageModule(new QName("addressing"));
- client.engageModule(new QName("rampart"));
-
+ client.engageModule("addressing");
+ client.engageModule("rampart");
+
OMElement response = client.sendReceive(getPayload("Hello world1"));
System.out.println("Response 1 : " + response);
response = client.sendReceive(getPayload("Hello world2"));
Modified: webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/ClientSideModuleEngagement.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/ClientSideModuleEngagement.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/ClientSideModuleEngagement.java (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/ClientSideModuleEngagement.java Thu Mar 22 14:01:46 2007
@@ -44,8 +44,7 @@
createConfigurationContextFromFileSystem(repository.getAbsolutePath(),
repository.getName() + "/axis2.xml");
ServiceClient serviceClient = new ServiceClient(configContext, null);
- serviceClient.engageModule(new QName("LoggingModule"));
-// call.engageModule(new QName("LoggingModule"));
+ serviceClient.engageModule("LoggingModule");
}
}
Modified: webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoBlockingDualClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoBlockingDualClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoBlockingDualClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoBlockingDualClient.java Thu Mar 22 14:01:46 2007
@@ -48,7 +48,7 @@
//Blocking Invocation
sender = new ServiceClient();
- sender.engageModule(new QName(Constants.MODULE_ADDRESSING));
+ sender.engageModule(Constants.MODULE_ADDRESSING);
sender.setOptions(options);
OMElement result = sender.sendReceive(payload);
Modified: webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java Thu Mar 22 14:01:46 2007
@@ -61,7 +61,7 @@
//Non-Blocking Invocation
sender = new ServiceClient();
- sender.engageModule(new QName(Constants.MODULE_ADDRESSING));
+ sender.engageModule(Constants.MODULE_ADDRESSING);
sender.setOptions(options);
sender.sendReceiveNonBlocking(payload, callback);
Modified: webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java Thu Mar 22 14:01:46 2007
@@ -48,7 +48,7 @@
options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
ServiceClient sender = new ServiceClient();
- sender.engageModule(new QName(Constants.MODULE_ADDRESSING));
+ sender.engageModule(Constants.MODULE_ADDRESSING);
sender.setOptions(options);
OMElement result = sender.sendReceive(getPayload());
Modified: webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/TCPClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/TCPClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/TCPClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/TCPClient.java Thu Mar 22 14:01:46 2007
@@ -47,7 +47,7 @@
options.setAction("urn:echo");
ServiceClient sender = new ServiceClient();
- sender.engageModule(new QName(Constants.MODULE_ADDRESSING));
+ sender.engageModule(Constants.MODULE_ADDRESSING);
sender.setOptions(options);
OMElement result = sender.sendReceive(getPayload());
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org