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 [1/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...
Author: gdaniels
Date: Thu Mar 22 14:01:46 2007
New Revision: 521461
URL: http://svn.apache.org/viewvc?view=rev&rev=521461
Log:
Refactor Modules to be named with Strings, not QNames.
This burbled into an awful lot of places, so I still need to go back and add a few deprecated (commented-out) setters for the QName versions - but I want to check this in so that merging doesn't get outrageous.
Also the usual little bits of code cleanup in here, and remove the explicit locked="false" attributes from the default axis2.xml in the kernel.
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingFinalServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingSubmissionServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleversionTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleConfigTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ParameterAddTest.java
webservices/axis2/trunk/java/modules/samples/deprecated/sgccalculator/src/sample/sgccalculator/CalcClient.java
webservices/axis2/trunk/java/modules/samples/security/basic/sample11/src/org/apache/rampart/samples/sample11/Client.java
webservices/axis2/trunk/java/modules/samples/security/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java
webservices/axis2/trunk/java/modules/samples/security/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java
webservices/axis2/trunk/java/modules/samples/security/policy/sample03/src/org/apache/rampart/samples/policy/sample03/Client.java
webservices/axis2/trunk/java/modules/samples/security/policy/sample04/src/org/apache/rampart/samples/policy/sample04/Client.java
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/ClientSideModuleEngagement.java
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoBlockingDualClient.java
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/TCPClient.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingModule.java Thu Mar 22 14:01:46 2007
@@ -33,18 +33,16 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
-import javax.xml.namespace.QName;
import java.util.List;
public class AddressingModule implements Module {
private static final Log log = LogFactory.getLog(AddressingModule.class);
- private static final QName ADDRESSING = new QName(Constants.MODULE_ADDRESSING);
public void init(ConfigurationContext arg0, AxisModule arg1)
throws AxisFault {
AxisConfiguration axisConfig = arg0.getAxisConfiguration();
- ModuleConfiguration moduleConfig = axisConfig.getModuleConfig(ADDRESSING);
+ ModuleConfiguration moduleConfig = axisConfig.getModuleConfig(Constants.MODULE_ADDRESSING);
if (moduleConfig != null) {
List list = moduleConfig.getParameters();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingFinalServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingFinalServiceTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingFinalServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingFinalServiceTest.java Thu Mar 22 14:01:46 2007
@@ -202,7 +202,7 @@
sender = new ServiceClient(configcontext, service);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
@@ -264,7 +264,7 @@
sender = new ServiceClient(configcontext, service);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingSubmissionServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingSubmissionServiceTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingSubmissionServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/AddressingSubmissionServiceTest.java Thu Mar 22 14:01:46 2007
@@ -203,7 +203,7 @@
sender = new ServiceClient(configcontext, service);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
@@ -224,7 +224,7 @@
sender = new ServiceClient(configcontext, service);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/addressing/MultiHopRedirectServiceTest.java Thu Mar 22 14:01:46 2007
@@ -161,7 +161,7 @@
options.setUseSeparateListener(true);
sender = new ServiceClient(configcontext, service);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java Thu Mar 22 14:01:46 2007
@@ -144,7 +144,7 @@
sender = new ServiceClient(configcontext, service);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageSaveAndRestoreTest.java Thu Mar 22 14:01:46 2007
@@ -125,7 +125,7 @@
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
OMElement result = sender.sendReceive(payload);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java Thu Mar 22 14:01:46 2007
@@ -42,7 +42,6 @@
private QName operationName =
new QName("http://ws.apache.org/axis2", "echoVoid");
- private AxisConfiguration config;
private ClassLoader cl;
public MessageWithServerTest(String testName) {
@@ -62,11 +61,10 @@
//service.setFaultInFlow(new MockFlow("service faultflow", 1));
- AxisModule m1 = new AxisModule(
- new QName("", "A Module 1"));
+ AxisModule m1 = new AxisModule("A Module 1");
m1.setInFlow(new MockFlow("service module inflow", 4));
//m1.setFaultInFlow(new MockFlow("service module faultflow", 1));
- config = new AxisConfiguration();
+ AxisConfiguration config = new AxisConfiguration();
config.addMessageReceiver(
"http://www.w3.org/2004/08/wsdl/in-only", new RawXMLINOnlyMessageReceiver());
config.addMessageReceiver(
@@ -121,7 +119,7 @@
Socket socket = new Socket("127.0.0.1", UtilServer.TESTING_PORT);
OutputStream out = socket.getOutputStream();
byte[] buf = new byte[1024];
- int index = -1;
+ int index;
while ((index = in.read(buf)) > 0) {
out.write(buf, 0, index);
}
@@ -129,7 +127,7 @@
InputStream respose = socket.getInputStream();
Reader rReader = new InputStreamReader(respose);
char[] charBuf = new char[1024];
- while ((index = rReader.read(charBuf)) > 0) {
+ while ((rReader.read(charBuf)) > 0) {
log.info(new String(charBuf));
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java Thu Mar 22 14:01:46 2007
@@ -163,7 +163,7 @@
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
return sender;
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java Thu Mar 22 14:01:46 2007
@@ -92,7 +92,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
- configContext.getAxisConfiguration().engageModule(new QName("addressing"));
+ configContext.getAxisConfiguration().engageModule("addressing");
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java Thu Mar 22 14:01:46 2007
@@ -151,7 +151,7 @@
ServiceClient sender = new ServiceClient(configurationContext,null);
sender.setOptions(options);
- sender.engageModule(new QName("addressing"));
+ sender.engageModule("addressing");
OMElement result = sender.sendReceive(payload);
Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Thu Mar 22 14:01:46 2007
@@ -15,65 +15,65 @@
* limitations under the License.
*/
-->
-
+
<axisconfig name="AxisJava2.0">
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">false</parameter>
- <parameter name="enableSwA" locked="false">false</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">false</parameter>
+ <parameter name="enableSwA">false</parameter>
<!--Uncomment if you want to enable file caching for attachments -->
- <!--parameter name="cacheAttachments" locked="false">true</parameter>
- <parameter name="attachmentDIR" locked="false"></parameter>
- <parameter name="sizeThreshold" locked="false">4000</parameter-->
+ <!--parameter name="cacheAttachments">true</parameter>
+ <parameter name="attachmentDIR"></parameter>
+ <parameter name="sizeThreshold">4000</parameter-->
<!--This will give out the timout of the configuration contexts, in milliseconds-->
- <parameter name="ConfigContextTimeoutInterval" locked="false">30000</parameter>
+ <parameter name="ConfigContextTimeoutInterval">30000</parameter>
<!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
<!--that behaviour.-->
- <parameter name="sendStacktraceDetailsWithFaults" locked="false">false</parameter>
+ <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
<!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
<!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
<!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
<!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
- <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
+ <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
<!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
- <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
+ <!--<parameter name="ServicesDirectory">service</parameter>-->
<!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
- <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
+ <!--<parameter name="ModulesDirectory">modules</parameter>-->
<!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
<!--root which can configured using the following contextRoot parameter-->
- <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->
+ <!--<parameter name="contextRoot">axis2</parameter>-->
<!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints-->
<!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
<!--context path to proper Axis2 servlets-->
- <!--<parameter name="servicePath" locked="false">services</parameter>-->
- <!--<parameter name="restPath" locked="false">rest</parameter>-->
+ <!--<parameter name="servicePath">services</parameter>-->
+ <!--<parameter name="restPath">rest</parameter>-->
<!-- Following parameter will completely disable REST handling in Axis2-->
<parameter name="disableREST" locked="true">false</parameter>
<!-- If you have a frontend host which exposes this webservice using a different public URL -->
<!-- use this parameter to override autodetected url -->
- <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+ <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
<!-- The way of adding listener to the system-->
<!-- <listener class="org.apache.axis2.ObserverIMPL">-->
- <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
<!-- </listener>-->
<!-- ================================================= -->
@@ -127,7 +127,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">8080</parameter>
+ <parameter name="port">8080</parameter>
<!-- Here is the complete list of supported parameters (see example settings further below):
port: the port to listen on (default 6060)
hostname: if non-null, url prefix used in reply-to endpoint references (default null)
@@ -142,53 +142,53 @@
note that no such threads can exist with default unbounded request queue
threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS)
-->
- <!-- <parameter name="hostname" locked="false">http://www.myApp.com/ws</parameter> -->
- <!-- <parameter name="originServer" locked="false">My-Server/1.1</parameter> -->
- <!-- <parameter name="requestTimeout" locked="false">10000</parameter> -->
- <!-- <parameter name="requestTcpNoDelay" locked="false">false</parameter> -->
- <!-- <parameter name="requestCoreThreadPoolSize" locked="false">50</parameter> -->
- <!-- <parameter name="RequestMaxThreadPoolSize" locked="false">100</parameter> -->
- <!-- <parameter name="threadKeepAliveTime" locked="false">240000</parameter> -->
- <!-- <parameter name="threadKeepAliveTimeUnit" locked="false">MILLISECONDS</parameter> -->
+ <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
+ <!-- <parameter name="originServer">My-Server/1.1</parameter> -->
+ <!-- <parameter name="requestTimeout">10000</parameter> -->
+ <!-- <parameter name="requestTcpNoDelay">false</parameter> -->
+ <!-- <parameter name="requestCoreThreadPoolSize">50</parameter> -->
+ <!-- <parameter name="RequestMaxThreadPoolSize">100</parameter> -->
+ <!-- <parameter name="threadKeepAliveTime">240000</parameter> -->
+ <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
</transportReceiver>
-
+
<!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
<transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
- <parameter name="myTopicConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ <parameter name="myTopicConnectionFactory">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
</parameter>
- <parameter name="myQueueConnectionFactory" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="myQueueConnectionFactory">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
- <parameter name="default" locked="false">
- <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="default">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
</transportReceiver>-->
<!--Uncomment if you want to have SMTP transport support-->
<!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
- <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
- <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
- <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
- <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
- <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
+ <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
+ <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
+ <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
<!--</transportReceiver>-->
<!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter-->>
+ <parameter name="port">6060</parameter-->>
<!--If you want to give your own host address for EPR generation-->
<!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+ <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
<!-- /transportReceiver -->
<!-- ================================================= -->
@@ -201,17 +201,17 @@
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
-
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
+
<!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages -->
- <!-- <parameter name="OmitSOAP12Action" locked="false">true</parameter> -->
+ <!-- <parameter name="OmitSOAP12Action">true</parameter> -->
</transportSender>
-
+
<transportSender name="https"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
</transportSender>
<!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
<transportSender name="jms"
@@ -220,10 +220,10 @@
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user">axis2</parameter>
+ <parameter name="transport.mail.smtp.password">axis2</parameter>
+ <parameter name="transport.mail.smtp.port">25</parameter>
</transportSender>
-->
@@ -235,27 +235,27 @@
<!--Configuring module , providing parameters for modules whether they refer or not-->
<!--<moduleConfig name="addressing">-->
- <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+ <!--<parameter name="addressingPara">N/A</parameter>-->
<!--</moduleConfig>-->
<!-- ================================================= -->
<!-- Clustering -->
<!-- ================================================= -->
- <!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
- <!--
- <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
- <parameter name="param1" locked="false">value1</parameter>
- <configurationManager class="org.apache.axis2.cluster.tribes.configuration.TribesConfigurationManager">
- <listeners>
- </listeners>
- </configurationManager>
- <contextManager class="org.apache.axis2.cluster.tribes.context.TribesContextManager">
- <listeners>
- </listeners>
+ <!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
+ <!--
+ <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
+ <parameter name="param1">value1</parameter>
+ <configurationManager class="org.apache.axis2.cluster.tribes.configuration.TribesConfigurationManager">
+ <listeners>
+ </listeners>
+ </configurationManager>
+ <contextManager class="org.apache.axis2.cluster.tribes.context.TribesContextManager">
+ <listeners>
+ </listeners>
</contextManager>
</cluster>
-->
-
+
<!-- ================================================= -->
<!-- Phases -->
<!-- ================================================= -->
@@ -292,7 +292,7 @@
class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
<order phase="Dispatch"/>
</handler>
-
+
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="Dispatch"/>
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Thu Mar 22 14:01:46 2007
@@ -310,17 +310,27 @@
/**
* Engage a module for this service client.
*
+ * @deprecate Please use String version instead
* @param moduleName name of the module to engage
* @throws AxisFault if something goes wrong
*/
public void engageModule(QName moduleName) throws AxisFault {
+ engageModule(moduleName.getLocalPart());
+ }
+
+ /**
+ * Engage a module for this service client.
+ *
+ * @param moduleName name of the module to engage
+ * @throws AxisFault if something goes wrong
+ */
+ public void engageModule(String moduleName) throws AxisFault {
synchronized (this) {
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
axisService.engageModule(module, axisConfig);
} else {
- throw new AxisFault("Unable to engage module : " +
- moduleName.getLocalPart());
+ throw new AxisFault("Unable to engage module : " + moduleName);
}
}
}
@@ -328,9 +338,19 @@
/**
* Disengage a module for this service client
*
+ * @deprecate Please use String version instead
* @param moduleName
*/
public void disengageModule(QName moduleName) {
+ disengageModule(moduleName.getLocalPart());
+ }
+
+ /**
+ * Disengage a module for this service client
+ *
+ * @param moduleName
+ */
+ public void disengageModule(String moduleName) {
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
axisService.disengageModule(module);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/WSDLBasedPolicyProcessor.java Thu Mar 22 14:01:46 2007
@@ -147,7 +147,7 @@
private void engageModulesToAxisDescription(List modulesToEngage,
AxisDescription axisDescription) throws AxisFault {
AxisModule axisModule;
- QName moduleName;
+ String moduleName;
for (Iterator iterator = modulesToEngage.iterator(); iterator.hasNext();) {
axisModule = (AxisModule) iterator.next();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Thu Mar 22 14:01:46 2007
@@ -753,7 +753,7 @@
if (opDesc != null) {
- moduleConfig = opDesc.getModuleConfig(new QName(moduleName));
+ moduleConfig = opDesc.getModuleConfig(moduleName);
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
@@ -774,7 +774,7 @@
if (axisService != null) {
- moduleConfig = axisService.getModuleConfig(new QName(moduleName));
+ moduleConfig = axisService.getModuleConfig(moduleName);
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
@@ -795,8 +795,7 @@
if (axisServiceDesc != null) {
- moduleConfig = axisServiceDesc
- .getModuleConfig(new QName(moduleName));
+ moduleConfig = axisServiceDesc.getModuleConfig(moduleName);
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
@@ -813,10 +812,9 @@
}
}
- AxisConfiguration baseConfig = configurationContext
- .getAxisConfiguration();
+ AxisConfiguration baseConfig = configurationContext.getAxisConfiguration();
- moduleConfig = baseConfig.getModuleConfig(new QName(moduleName));
+ moduleConfig = baseConfig.getModuleConfig(moduleName);
if (moduleConfig != null) {
param = moduleConfig.getParameter(key);
@@ -832,7 +830,7 @@
}
}
- AxisModule module = baseConfig.getModule(new QName(moduleName));
+ AxisModule module = baseConfig.getModule(moduleName);
if (module != null) {
param = module.getParameter(key);
@@ -1501,7 +1499,7 @@
}
- public boolean isEngaged(QName moduleName) {
+ public boolean isEngaged(String moduleName) {
if (LoggingControl.debugLoggingAllowed) {
checkActivateWarning("isEngaged");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java Thu Mar 22 14:01:46 2007
@@ -43,7 +43,7 @@
// Attempt to engage MEX module
/* try{
- super.engageModule(new QName("metadataExchange"));
+ super.engageModule("metadataExchange");
}
catch (Exception e){
throw new AxisFault ("Unable to proceed with GetMetadata Request!", e);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Thu Mar 22 14:01:46 2007
@@ -290,7 +290,7 @@
} else {
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
- new ModuleConfiguration(new QName(module), parent);
+ new ModuleConfiguration(module, parent);
Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Thu Mar 22 14:01:46 2007
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
@@ -60,10 +61,21 @@
import java.util.zip.ZipInputStream;
public abstract class DeploymentEngine implements DeploymentConstants {
-
private static final Log log = LogFactory.getLog(DeploymentEngine.class);
- protected boolean hotUpdate = true; // to do hot update or not
- protected boolean hotDeployment = true; // to do hot deployment or not
+
+ //to keep the web resource location if any
+ protected static String webLocationString = null;
+
+ public static void setWebLocationString(String webLocationString) {
+ DeploymentEngine.webLocationString = webLocationString;
+ }
+
+ /** Support for hot update is controlled by this flag */
+ protected boolean hotUpdate = true;
+
+ /** Support for hot deployment is controlled by this flag */
+ protected boolean hotDeployment = true;
+
/**
* Stores all the web Services to deploy.
*/
@@ -74,9 +86,6 @@
*/
protected List wsToUnDeploy = new ArrayList();
- //to keep the web resource location if any
- protected static String webLocationString = null;
-
/**
* to keep a ref to engine register
* this ref will pass to engine when it call start()
@@ -203,7 +212,7 @@
module.setModuleClassLoader(deploymentClassLoader);
module.setParent(axisConfig);
String moduleName = fileUrl.substring(0, fileUrl.indexOf(".mar"));
- module.setName(new QName(moduleName));
+ module.setName(moduleName);
populateModule(module, moduleurl);
module.setFileName(moduleurl);
addNewModule(module, axisConfig);
@@ -431,7 +440,7 @@
ArrayList groupModules = serviceGroup.getModuleRefs();
for (int i = 0; i < groupModules.size(); i++) {
- QName moduleName = (QName) groupModules.get(i);
+ String moduleName = (String) groupModules.get(i);
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
@@ -440,7 +449,7 @@
throw new DeploymentException(
Messages.getMessage(
DeploymentErrorMsgs.BAD_MODULE_FROM_SERVICE,
- serviceGroup.getServiceGroupName(), moduleName.getLocalPart()));
+ serviceGroup.getServiceGroupName(), moduleName));
}
}
@@ -457,7 +466,7 @@
ArrayList list = axisService.getModules();
for (int i = 0; i < list.size(); i++) {
- AxisModule module = axisConfig.getModule((QName) list.get(i));
+ AxisModule module = axisConfig.getModule((String)list.get(i));
if (module == null) {
throw new DeploymentException(
@@ -475,7 +484,7 @@
ArrayList modules = opDesc.getModuleRefs();
for (int i = 0; i < modules.size(); i++) {
- QName moduleName = (QName) modules.get(i);
+ String moduleName = (String) modules.get(i);
AxisModule module = axisConfig.getModule(moduleName);
if (module != null) {
@@ -485,7 +494,7 @@
Messages.getMessage(
DeploymentErrorMsgs.BAD_MODULE_FROM_OPERATION,
opDesc.getName().getLocalPart(),
- moduleName.getLocalPart()));
+ moduleName));
}
}
}
@@ -693,7 +702,7 @@
return fileName;
}
- public AxisModule getModule(QName moduleName) throws AxisFault {
+ public AxisModule getModule(String moduleName) throws AxisFault {
return axisConfig.getModule(moduleName);
}
@@ -745,29 +754,17 @@
* Sets hotDeployment and hot update.
*/
protected void setDeploymentFeatures() {
- String value;
- Parameter parahotdeployment = axisConfig.getParameter(TAG_HOT_DEPLOYMENT);
- Parameter parahotupdate = axisConfig.getParameter(TAG_HOT_UPDATE);
-
- if (parahotdeployment != null) {
- value = (String) parahotdeployment.getValue();
+ Parameter hotDeployment = axisConfig.getParameter(TAG_HOT_DEPLOYMENT);
+ Parameter hotUpdate = axisConfig.getParameter(TAG_HOT_UPDATE);
- if ("false".equalsIgnoreCase(value)) {
- hotDeployment = false;
- }
+ if (hotDeployment != null) {
+ this.hotDeployment = JavaUtils.isTrue(hotDeployment.getValue(), true);
}
- if (parahotupdate != null) {
- value = (String) parahotupdate.getValue();
-
- if ("false".equalsIgnoreCase(value)) {
- hotUpdate = false;
- }
+ if (hotUpdate != null) {
+ this.hotUpdate = JavaUtils.isTrue(hotUpdate.getValue(), true);
}
- if (parahotupdate != null) {
- value = (String) parahotupdate.getValue();
- }
String serviceDirPara = (String)
axisConfig.getParameterValue(DeploymentConstants.SERVICE_DIR_PATH);
if (serviceDirPara != null) {
@@ -858,10 +855,6 @@
return webLocationString;
}
- public void setWebLocationString(String webLocationString) {
- this.webLocationString = webLocationString;
- }
-
public void setConfigContext(ConfigurationContext configContext) {
this.configContext = configContext;
initializeDeployers(this.configContext);
@@ -949,12 +942,6 @@
throws DeploymentException {
AxisService axisService = new AxisService();
try {
-
- AxisConfiguration axisConfig = configCtx.getAxisConfiguration();
- Parameter parahotupdate = axisConfig.getParameter(TAG_HOT_UPDATE);
- if (parahotupdate != null) {
- String value = (String) parahotupdate.getValue();
- }
DeploymentFileData currentDeploymentFile = new DeploymentFileData(
DeploymentConstants.TYPE_SERVICE, "");
currentDeploymentFile.setClassLoader(classLoader);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Thu Mar 22 14:01:46 2007
@@ -469,7 +469,7 @@
if (moduleRefAttribute != null) {
String refName = moduleRefAttribute.getAttributeValue();
- if (axisConfig.getModule(new QName(refName)) == null) {
+ if (axisConfig.getModule(refName) == null) {
throw new DeploymentException(Messages.getMessage(
DeploymentErrorMsgs.MODULE_NOT_FOUND, refName));
} else {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java Thu Mar 22 14:01:46 2007
@@ -67,7 +67,7 @@
metaData.setFileName(deploymentFileData.getFile().toURL());
DeploymentEngine.addNewModule(metaData, axisConfig);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
- metaData.getName().getLocalPart()));
+ metaData.getName()));
} catch (DeploymentException e) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
deploymentFileData.getName(),
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Mar 22 14:01:46 2007
@@ -578,7 +578,7 @@
if (moduleRefAttribute != null) {
String refName = moduleRefAttribute.getAttributeValue();
- if (axisConfig.getModule(new QName(refName)) == null) {
+ if (axisConfig.getModule(refName) == null) {
throw new DeploymentException(
Messages.getMessage(DeploymentErrorMsgs.MODULE_NOT_FOUND, refName));
} else {
@@ -604,7 +604,7 @@
} else {
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
- new ModuleConfiguration(new QName(module), parent);
+ new ModuleConfiguration(module, parent);
Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
@@ -755,7 +755,7 @@
} else {
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
- new ModuleConfiguration(new QName(module), parent);
+ new ModuleConfiguration(module, parent);
Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Thu Mar 22 14:01:46 2007
@@ -122,7 +122,7 @@
if (moduleRefAttribute != null) {
String refName = moduleRefAttribute.getAttributeValue();
- if (axisConfig.getModule(new QName(refName)) == null) {
+ if (axisConfig.getModule(refName) == null) {
throw new DeploymentException(
Messages.getMessage(DeploymentErrorMsgs.MODULE_NOT_FOUND, refName));
} else {
@@ -148,7 +148,7 @@
} else {
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
- new ModuleConfiguration(new QName(module), parent);
+ new ModuleConfiguration(module, parent);
Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Thu Mar 22 14:01:46 2007
@@ -463,10 +463,8 @@
moduleXMLFound = true;
ModuleBuilder builder = new ModuleBuilder(zin, module, axisConfig);
// setting module name
- module.setName(
- new QName(
- DescriptionBuilder.getShortFileName(
- deploymentFile.getServiceName())));
+ module.setName(DescriptionBuilder.getShortFileName(
+ deploymentFile.getServiceName()));
builder.populateModule();
break;
}
@@ -493,10 +491,8 @@
in = new FileInputStream(file);
ModuleBuilder builder = new ModuleBuilder(in, module, axisConfig);
// setting module name
- module.setName(
- new QName(
- DescriptionBuilder.getShortFileName(
- deploymentFile.getServiceName())));
+ module.setName(DescriptionBuilder.getShortFileName(
+ deploymentFile.getServiceName()));
builder.populateModule();
} catch (FileNotFoundException e) {
throw new DeploymentException(
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Thu Mar 22 14:01:46 2007
@@ -20,7 +20,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.util.WSDLSerializationUtil;
-import org.apache.axis2.wsdl.SOAPModuleMessage;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
@@ -101,8 +100,8 @@
throw new UnsupportedOperationException("Sorry we do not support this");
}
- public boolean isEngaged(QName moduleName) {
- throw new UnsupportedOperationException("axisMessage.isEngaged(qName) is not supported");
+ public boolean isEngaged(String moduleName) {
+ throw new UnsupportedOperationException("axisMessage.isEngaged() is not supported");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Thu Mar 22 14:01:46 2007
@@ -111,8 +111,8 @@
throw new UnsupportedOperationException("Sorry we do not support this");
}
- public boolean isEngaged(QName moduleName) {
- throw new UnsupportedOperationException("axisMessage.isEngaged(qName) is not supported");
+ public boolean isEngaged(String moduleName) {
+ throw new UnsupportedOperationException("axisMessage.isEngaged() is not supported");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java Thu Mar 22 14:01:46 2007
@@ -20,7 +20,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.util.WSDLSerializationUtil;
-import org.apache.axis2.wsdl.SOAPModuleMessage;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
@@ -101,8 +100,8 @@
throw new UnsupportedOperationException("Sorry we do not support this");
}
- public boolean isEngaged(QName moduleName) {
- throw new UnsupportedOperationException("axisMessage.isEngaged(qName) is not supported");
+ public boolean isEngaged(String moduleName) {
+ throw new UnsupportedOperationException("axisMessage.isEngaged() is not supported");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Thu Mar 22 14:01:46 2007
@@ -26,7 +26,6 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -335,8 +334,7 @@
module = axisModule.getModule();
if (!(module == null || module.canSupportAssertion(assertion))) {
- log.debug(((AxisModule) axisModule).getName()
- + " says it can't support " + assertion.getName());
+ log.debug(axisModule.getName() + " says it can't support " + assertion.getName());
return false;
}
}
@@ -389,5 +387,12 @@
public abstract void engageModule(AxisModule axisModule,
AxisConfiguration axisConfig) throws AxisFault;
- public abstract boolean isEngaged(QName axisModule);
+// /**
+// * @deprecate Please use String version instead
+// * @param moduleName
+// * @return
+// */
+// public abstract boolean isEngaged(QName moduleName);
+
+ public abstract boolean isEngaged(String moduleName);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Thu Mar 22 14:01:46 2007
@@ -25,7 +25,6 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMAbstractFactory;
-import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Map;
@@ -108,8 +107,8 @@
throw new UnsupportedOperationException("Sorry we do not support this");
}
- public boolean isEngaged(QName moduleName) {
- throw new UnsupportedOperationException("axisMessage.isEngaged(qName) is not supported");
+ public boolean isEngaged(String moduleName) {
+ throw new UnsupportedOperationException("axisMessage.isEngaged() is not supported");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java Thu Mar 22 14:01:46 2007
@@ -150,8 +150,8 @@
throw new UnsupportedOperationException("Sorry we do not support this");
}
- public boolean isEngaged(QName moduleName) {
- throw new UnsupportedOperationException("axisMessage.isEngaged(qName) is not supported");
+ public boolean isEngaged(String moduleName) {
+ throw new UnsupportedOperationException("axisMessage.isEngaged() is not supported");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java Thu Mar 22 14:01:46 2007
@@ -56,10 +56,10 @@
/**
* Field name
*/
- private QName name;
+ private String name;
// to store module operations , which are suppose to be added to a service if it is engaged to a service
- private HashMap operations;
+ private HashMap operations = new HashMap();
private AxisConfiguration parent;
/*
@@ -78,7 +78,6 @@
* Constructor ModuleDescription.
*/
public AxisModule() {
- operations = new HashMap();
}
/**
@@ -86,8 +85,7 @@
*
* @param name
*/
- public AxisModule(QName name) {
- this();
+ public AxisModule(String name) {
this.name = name;
}
@@ -148,9 +146,10 @@
}
/**
- * @return Returns QName.
+ * Get the name of this Module
+ * @return a String name.
*/
- public QName getName() {
+ public String getName() {
return name;
}
@@ -235,7 +234,7 @@
/**
* @param name
*/
- public void setName(QName name) {
+ public void setName(String name) {
this.name = name;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Thu Mar 22 14:01:46 2007
@@ -23,7 +23,6 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.util.WSDLSerializationUtil;
-import org.apache.axis2.namespace.Constants;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
@@ -169,10 +168,10 @@
}
Iterator module_itr = engagedModules.iterator();
boolean isEngagable;
- QName moduleName = moduleref.getName();
+ String moduleName = moduleref.getName();
while (module_itr.hasNext()) {
AxisModule module = (AxisModule) module_itr.next();
- QName modu = module.getName();
+ String modu = module.getName();
isEngagable = org.apache.axis2.util.Utils.checkVersion(moduleName, modu);
if (!isEngagable) {
return new ArrayList();
@@ -216,8 +215,7 @@
}
}
engagedModules.remove(module);
- log.debug("removed module from engaged modules list "
- + module.getName().getLocalPart());
+ log.debug("removed module from engaged modules list " + module.getName());
}
}
@@ -228,7 +226,7 @@
*/
public void removeFromEngagedModuleList(AxisModule module) {
engagedModules.remove(module);
- log.debug("removed module from engaged modules list " + module.getName().getLocalPart());
+ log.debug("removed module from engaged modules list " + module.getName());
}
@@ -476,7 +474,7 @@
return messageReceiver;
}
- public ModuleConfiguration getModuleConfig(QName moduleName) {
+ public ModuleConfiguration getModuleConfig(String moduleName) {
return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
@@ -625,11 +623,11 @@
return result;
}
- public boolean isEngaged(QName moduleName) {
+ public boolean isEngaged(String moduleName) {
Iterator engagedModuleItr = engagedModules.iterator();
while (engagedModuleItr.hasNext()) {
AxisModule axisModule = (AxisModule) engagedModuleItr.next();
- if (axisModule.getName().getLocalPart().equals(moduleName.getLocalPart())) {
+ if (axisModule.getName().equals(moduleName)) {
return true;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Thu Mar 22 14:01:46 2007
@@ -18,11 +18,6 @@
package org.apache.axis2.description;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMAttribute;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -51,7 +46,6 @@
import org.apache.axis2.transport.http.server.HttpUtils;
import org.apache.axis2.util.Loader;
import org.apache.axis2.util.XMLUtils;
-import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -68,26 +62,36 @@
import org.apache.ws.java2wsdl.utils.TypeTable;
import org.codehaus.jam.JAnnotation;
import org.codehaus.jam.JMethod;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import javax.wsdl.*;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.wsdl.xml.WSDLWriter;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.StringWriter;
-import java.io.ByteArrayInputStream;
import java.net.SocketException;
import java.net.URL;
import java.security.PrivilegedAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Class AxisService
@@ -500,8 +504,7 @@
}
axisOperation.engageModule(module, axisConfig);
} catch (AxisFault axisFault) {
- log.info(Messages.getMessage(
- "modulealredyengagetoservice", module.getName().getLocalPart()));
+ log.info(Messages.getMessage("modulealredyengagetoservice", module.getName()));
}
}
if (axisOperation.getMessageReceiver() == null) {
@@ -640,10 +643,10 @@
}
Iterator itr_engageModules = engagedModules.iterator();
boolean isEngagable;
- QName moduleName = axisModule.getName();
+ String moduleName = axisModule.getName();
while (itr_engageModules.hasNext()) {
AxisModule module = (AxisModule) itr_engageModules.next();
- QName modu = module.getName();
+ String modu = module.getName();
isEngagable = org.apache.axis2.util.Utils.checkVersion(moduleName, modu);
if (!isEngagable) {
return;
@@ -1094,7 +1097,7 @@
return lastupdate;
}
- public ModuleConfiguration getModuleConfig(QName moduleName) {
+ public ModuleConfiguration getModuleConfig(String moduleName) {
return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
@@ -1432,7 +1435,7 @@
}
}
- public boolean isEngaged(QName moduleName) {
+ public boolean isEngaged(String moduleName) {
AxisModule module = getAxisConfiguration().getModule(moduleName);
if (module == null) {
return false;
@@ -1440,7 +1443,7 @@
Iterator engagedModuleItr = engagedModules.iterator();
while (engagedModuleItr.hasNext()) {
AxisModule axisModule = (AxisModule) engagedModuleItr.next();
- if (axisModule.getName().getLocalPart().equals(module.getName().getLocalPart())) {
+ if (axisModule.getName().equals(module.getName())) {
return true;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java Thu Mar 22 14:01:46 2007
@@ -90,7 +90,7 @@
if (serviceGroupName == null) {
// setup a temporary name based on the first service under this group
- serviceGroupName = new String(service.getName());
+ serviceGroupName = service.getName();
}
service.setParent(this);
@@ -101,7 +101,7 @@
Iterator modules = this.engagedModules.iterator();
while (modules.hasNext()) {
- QName moduleName = (QName) modules.next();
+ String moduleName = (String) modules.next();
AxisModule axisModule = axisConfig.getModule(moduleName);
if (axisModule != null) {
@@ -112,8 +112,7 @@
}
service.engageModule(axisModule, axisConfig);
} else {
- throw new AxisFault(Messages.getMessage(
- "modulenotavailble", moduleName.getLocalPart()));
+ throw new AxisFault(Messages.getMessage("modulenotavailble", moduleName));
}
}
}
@@ -134,7 +133,7 @@
Iterator modules = this.engagedModules.iterator();
while (modules.hasNext()) {
- QName moduleName = (QName) modules.next();
+ String moduleName = (String) modules.next();
AxisModule axisModule = axisConfig.getModule(moduleName);
if (axisModule != null) {
@@ -145,8 +144,7 @@
}
service.engageModule(axisModule, axisConfig);
} else {
- throw new AxisFault(Messages.getMessage(
- "modulenotavailble", moduleName.getLocalPart()));
+ throw new AxisFault(Messages.getMessage("modulenotavailble", moduleName));
}
}
}
@@ -157,19 +155,33 @@
}
}
- public void addToengagedModules(QName moduleName) {
+// /**
+// * @deprecate Please use String version instead
+// * @param moduleName
+// */
+// public void addToengagedModules(String moduleName) {
+// }
+
+ public void addToengagedModules(String moduleName) {
engagedModules.add(moduleName);
}
- public void removeFromEngageList(QName moduleName) {
+// /**
+// * @deprecate Please use String version instead
+// * @param moduleName
+// */
+// public void removeFromEngageList(QName moduleName) {
+// }
+
+ public void removeFromEngageList(String moduleName) {
engagedModules.remove(moduleName);
}
public void engageModule(AxisModule module, AxisConfiguration axisConfig) throws AxisFault {
- QName moduleName = module.getName();
+ String moduleName = module.getName();
boolean isEngagable;
for (Iterator iterator = engagedModules.iterator(); iterator.hasNext();) {
- QName modu = (QName) iterator.next();
+ String modu = (String) iterator.next();
isEngagable = Utils.checkVersion(moduleName, modu);
if (!isEngagable) {
return;
@@ -209,7 +221,7 @@
return engagedModules;
}
- public ModuleConfiguration getModuleConfig(QName moduleName) {
+ public ModuleConfiguration getModuleConfig(String moduleName) {
return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
@@ -257,7 +269,7 @@
return this.serviceGroupName;
}
- public boolean isEngaged(QName moduleName) {
+ public boolean isEngaged(String moduleName) {
AxisModule module = getAxisDescription().getModule(moduleName);
if (module == null) {
return false;
@@ -265,7 +277,7 @@
Iterator engagedModuleItr = engagedModules.iterator();
while (engagedModuleItr.hasNext()) {
QName axisModule = (QName) engagedModuleItr.next();
- if (axisModule.getLocalPart().equals(module.getName().getLocalPart())) {
+ if (axisModule.getLocalPart().equals(module.getName())) {
return true;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java Thu Mar 22 14:01:46 2007
@@ -25,7 +25,6 @@
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.i18n.Messages;
-import javax.xml.namespace.QName;
import java.net.URI;
import java.net.URISyntaxException;
@@ -111,11 +110,11 @@
}
}
if (msgCtxt.getAxisService() != null) {
- if (!msgCtxt.isEngaged(new QName(Constants.MODULE_ADDRESSING))) {
+ if (!msgCtxt.isEngaged(Constants.MODULE_ADDRESSING)) {
throw new AxisFault(Messages.getMessage("2channelNeedAddressing"));
}
} else {
- if (!ac.isEngaged(new QName(Constants.MODULE_ADDRESSING))) {
+ if (!ac.isEngaged(Constants.MODULE_ADDRESSING)) {
throw new AxisFault(Messages.getMessage("2channelNeedAddressing"));
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java?view=diff&rev=521461&r1=521460&r2=521461
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ModuleConfiguration.java Thu Mar 22 14:01:46 2007
@@ -21,7 +21,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.i18n.Messages;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
/**
@@ -33,13 +32,13 @@
* Right now this just keeps stores the set of parameters
*/
public class ModuleConfiguration implements ParameterInclude {
- private QName moduleName;
+ private String moduleName;
private ParameterInclude parameterInclude;
// to keep the pointer to its parent , only to access parameters
private ParameterInclude parent;
- public ModuleConfiguration(QName moduleName, ParameterInclude parent) {
+ public ModuleConfiguration(String moduleName, ParameterInclude parent) {
this.moduleName = moduleName;
this.parent = parent;
parameterInclude = new ParameterIncludeImpl();
@@ -65,7 +64,7 @@
this.parameterInclude.deserializeParameters(parameterElement);
}
- public QName getModuleName() {
+ public String getModuleName() {
return moduleName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org