You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2007/06/27 18:46:04 UTC
svn commit: r551228 [13/23] - in /webservices/axis2/branches/java/jaxws21:
./ etc/ modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/src/org/apache/axis2/schema/writer/ module...
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java Wed Jun 27 09:45:37 2007
@@ -26,10 +26,10 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.HTTPLocationBasedDispatcher;
+import org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher;
import org.apache.axis2.engine.Handler;
-import org.apache.axis2.engine.RequestURIBasedDispatcher;
-import org.apache.axis2.engine.RequestURIOperationDispatcher;
+import org.apache.axis2.dispatchers.RequestURIBasedDispatcher;
+import org.apache.axis2.dispatchers.RequestURIOperationDispatcher;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.HTTPTransportUtils;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java Wed Jun 27 09:45:37 2007
@@ -83,6 +83,14 @@
*/
private String jndiName = null;
/**
+ * The JNDI name of the actual connection factory username
+ */
+ private String jndiUser = null;
+ /**
+ * The JNDI name of the actual connection factory password
+ */
+ private String jndiPass = null;
+ /**
* Map of destination JNDI names to service names
*/
private Map serviceJNDINameMapping = null;
@@ -171,6 +179,24 @@
}
/**
+ * Get the JNDI name of the actual factory username
+ *
+ * @return the jndi name of the actual connection factory username
+ */
+ public void setJndiUser(String jndiUser) {
+ this.jndiUser = jndiUser;
+ }
+
+ /**
+ * Get the JNDI name of the actual factory password
+ *
+ * @return the jndi name of the actual connection factory password
+ */
+ public void setJndiPass(String jndiPass) {
+ this.jndiPass = jndiPass;
+ }
+
+ /**
* Add a listen destination on this connection factory on behalf of the given service
*
* @param destinationJndi destination JNDI name
@@ -186,7 +212,13 @@
Connection con = null;
try {
- con = conFactory.createConnection();
+ if ((jndiUser == null) || (jndiPass == null)){
+ // User the OS username and credentials
+ con = conFactory.createConnection();
+ } else{
+ // use an explicit username and password
+ con = conFactory.createConnection(jndiUser, jndiPass);
+ }
Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue(destinationJndi);
destinationName = queue.getQueueName();
@@ -208,7 +240,7 @@
}
}
}
-
+
serviceDestinationMapping.put(destinationName, serviceName);
log.info("Mapping JNDI name : " + destinationJndi + " and JMS Destination name : " +
destinationName + " against service : " + serviceName);
@@ -259,6 +291,24 @@
}
/**
+ * Get the JNDI name of the actual factory username
+ *
+ * @return the jndi name of the actual connection factory username
+ */
+ public String getJndiUser() {
+ return jndiUser;
+ }
+
+ /**
+ * Get the JNDI name of the actual factory password
+ *
+ * @return the jndi name of the actual connection factory password
+ */
+ public String getJndiPass() {
+ return jndiPass;
+ }
+
+ /**
* Get the actual underlying connection factory
*
* @return actual connection factory
@@ -305,7 +355,13 @@
"Connection factory must be 'connected' before listening");
} else {
try {
- connection = conFactory.createConnection();
+ if ((jndiUser == null) || (jndiPass == null)){
+ // User the OS username and credentials
+ connection = conFactory.createConnection();
+ } else{
+ // use an explicit username and password
+ connection = conFactory.createConnection(jndiUser, jndiPass);
+ }
} catch (JMSException e) {
handleException("Error creating a JMS connection using the " +
"factory : " + jndiName, e);
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConstants.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSConstants.java Wed Jun 27 09:45:37 2007
@@ -58,10 +58,23 @@
* the local (Axis2) name of the connection factory and not a JNDI name
*/
public static final String CONFAC_PARAM = "transport.jms.ConnectionFactory";
+
/**
* The Parameter name indicating the JMS connection factory JNDI name
*/
public static final String CONFAC_JNDI_NAME_PARAM = "transport.jms.ConnectionFactoryJNDIName";
+
+ /**
+ * The Parameter name indicating the JMS connection factory username (useful for WebsphereMQ CLIENT connections)
+ * n.b. This is not the actual username, it is the JNDI name of the variable that will hold the username
+ */
+ public static final String CONFAC_JNDI_NAME_USER = "transport.jms.ConnectionFactoryJNDIUser";
+
+ /**
+ * The Parameter name indicating the JMS connection factory password (useful for WebsphereMQ CLIENT connections)
+ * n.b. This is not the actual password, it is the JNDI name of the variable that will hold the password
+ */
+ public static final String CONFAC_JNDI_NAME_PASS = "transport.jms.ConnectionFactoryJNDIPass";
/**
* The Parameter name indicating the operation to dispatch non SOAP/XML messages
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java Wed Jun 27 09:45:37 2007
@@ -232,6 +232,10 @@
Context.SECURITY_CREDENTIALS, (String) p.getValue());
} else if (JMSConstants.CONFAC_JNDI_NAME_PARAM.equals(p.getName())) {
jmsConFactory.setJndiName((String) p.getValue());
+ } else if (JMSConstants.CONFAC_JNDI_NAME_USER.equals(p.getName())) {
+ jmsConFactory.setJndiUser((String) p.getValue());
+ } else if (JMSConstants.CONFAC_JNDI_NAME_PASS.equals(p.getName())) {
+ jmsConFactory.setJndiPass((String) p.getValue());
} else if (JMSConstants.DEST_PARAM.equals(p.getName())) {
StringTokenizer st =
new StringTokenizer((String) p.getValue(), " ,");
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/README.txt?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/README.txt (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/jms/README.txt Wed Jun 27 09:45:37 2007
@@ -4,20 +4,20 @@
================
<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>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java Wed Jun 27 09:45:37 2007
@@ -17,13 +17,10 @@
package org.apache.axis2.transport.mail;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.context.*;
@@ -33,6 +30,7 @@
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,9 +41,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.Properties;
-import java.util.Hashtable;
/**
* This is the implementation for Mail Listener in Axis2. It has the full capability
@@ -283,10 +281,10 @@
MimeMessage msg = (MimeMessage) msgs[i];
try {
MessageContext mc = createMessageContextToMailWorker(msg);
+ msg.setFlag(Flags.Flag.DELETED, true);
if(mc==null){
continue;
}
- msg.setFlag(Flags.Flag.DELETED, true);
MailWorker worker = new MailWorker(configurationContext,mc);
this.configurationContext.getThreadPool().execute(worker);
} catch (Exception e) {
@@ -412,11 +410,12 @@
String soapAction;
/* Set the Charactorset Encoding */
- if (BuilderUtil.getCharSetEncoding(part.getContentType()) != null) {
+ String contentType = part.getContentType();
+ String charSetEncoding = BuilderUtil.getCharSetEncoding(contentType);
+ if (charSetEncoding != null) {
msgContext.setProperty(
org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING,
- BuilderUtil.getCharSetEncoding(
- part.getContentType()));
+ charSetEncoding);
} else {
msgContext.setProperty(
org.apache.axis2.Constants.Configuration.CHARACTER_SET_ENCODING,
@@ -437,14 +436,27 @@
msgContext.setTo(new EndpointReference(contentDescription));
}
- if (part.getContentType().indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) >
- -1) {
+ if (contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) > -1) {
TransportUtils
- .processContentTypeForAction(part.getContentType(), msgContext);
+ .processContentTypeForAction(contentType, msgContext);
+ } else {
+ // According to the mail sepec, mail transport should support only
+ // application/soap+xml;
+ String message = "According to the mail sepec, mail transport " +
+ "should support only application/soap+xml";
+ log.error(message);
+ throw new AxisFault(message);
+ }
+
+ String cte = getMailHeaderFromPart(part, "Content-Transfer-Encoding");
+ if (!(cte != null && cte.equalsIgnoreCase("base64"))) {
+ String message = "Processing of Content-Transfer-Encoding faild.";
+ log.error(message);
+ throw new AxisFault(message);
}
InputStream inputStream = part.getInputStream();
SOAPEnvelope envelope = TransportUtils
- .createSOAPMessage(msgContext, inputStream, part.getContentType());
+ .createSOAPMessage(msgContext, inputStream, contentType);
msgContext.setEnvelope(envelope);
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Loader.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Loader.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Loader.java Wed Jun 27 09:45:37 2007
@@ -218,6 +218,9 @@
return c;
}
}
+ } catch (UnsupportedClassVersionError e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Throwable e) {
log.debug(e);
}
@@ -244,6 +247,9 @@
return c;
}
}
+ } catch (UnsupportedClassVersionError e) {
+ log.error(e.getMessage(), e);
+ throw e;
} catch (Throwable e) {
log.debug(e);
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java Wed Jun 27 09:45:37 2007
@@ -283,14 +283,14 @@
}
/**
- * Will check whether a given module can be engage or not
- * if the version mismamathc then thow en exception
+ *
* - if he trying to engage the same module then method will returen false
* - else it will return true
*
- * @param deployingModuleName
- * @param deployedModulename
- * @throws AxisFault
+ * @param deployingModuleName the module we're currently deploying
+ * @param deployedModulename an existing module
+ * @return true if these are different modules, false if they're the same
+ * @throws AxisFault if two different versions of the same module are deployed
*/
public static boolean checkVersion(String deployingModuleName,
String deployedModulename) throws AxisFault {
@@ -304,9 +304,10 @@
throw new AxisFault("trying to engage two different module versions " +
module1version + " : " + module2version);
} else {
- return false;
+ return true;
}
- } else if (module2version == null) {
+ } else if (module2version != null) {
+ // TODO: Check default version?
return false;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLUtils.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLUtils.java Wed Jun 27 09:45:37 2007
@@ -189,7 +189,13 @@
throws ParserConfigurationException, SAXException, IOException {
DocumentBuilder db;
synchronized (dbf) {
- db = dbf.newDocumentBuilder();
+ try {
+ db = dbf.newDocumentBuilder();
+ } catch (Exception e){
+ // Under some peculiar conditions (classloader issues), just scrap the old dbf, create a new one and try again.
+ dbf = getDOMFactory();
+ db = dbf.newDocumentBuilder();
+ }
}
db.setEntityResolver(new DefaultEntityResolver());
db.setErrorHandler(new ParserErrorHandler());
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,14 +2,14 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">true</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">true</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>
- <parameter name="seralizeLocation" locked="false">.</parameter>
+ <parameter name="seralizeLocation">.</parameter>
<hostConfiguration>
<ip>127.0.0.1</ip>
<port>5555</port>
@@ -22,11 +22,11 @@
<!-- Transport Ins -->
<!-- ================================================= -->
<transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<!-- ================================================= -->
@@ -36,29 +36,29 @@
<transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" 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="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
<transportSender name="https"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
</phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -76,16 +76,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml Wed Jun 27 09:45:37 2007
@@ -3,19 +3,19 @@
<description>
This is a testing service , to test the system is working or not
</description>
- <parameter name="ServiceClass" locked="false">org.apache.axis2.sample.echo.EchoImpl</parameter>
+ <parameter name="ServiceClass">org.apache.axis2.sample.echo.EchoImpl</parameter>
<operation name="echoString">
<module ref="module1"/>
<message label="In">
- <parameter name="messageIN" locked="false">messageIN</parameter>
+ <parameter name="messageIN">messageIN</parameter>
</message>
</operation>
<operation name="echoStringArray">
<message label="In">
- <parameter name="messageIN" locked="false">messageIN</parameter>
+ <parameter name="messageIN">messageIN</parameter>
</message>
<message label="Out">
- <parameter name="messageOut" locked="false">messageOut</parameter>
+ <parameter name="messageOut">messageOut</parameter>
</message>
</operation>
</service>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadConfigOrderChange/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadConfigOrderChange/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadConfigOrderChange/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadConfigOrderChange/axis2.xml Wed Jun 27 09:45:37 2007
@@ -1,11 +1,11 @@
<axisconfig name="AxisJava2.0">
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">true</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">true</parameter>
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
+ <parameter name="PROTOCOL">HTTP/1.0</parameter>
</transportSender>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadServer.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadServer.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadServer.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/BadServer.xml Wed Jun 27 09:45:37 2007
@@ -1,6 +1,6 @@
<axisconfig name="AxisJava2.0">
<parameter name="para1" locked="xsd:true">10</parameter>
- <parameter name="para2" locked="false">Colombo</parameter>
+ <parameter name="para2">Colombo</parameter>
<handler name="h1" class="org.apache.axis2.engine.registry.SpeakingHandler">
<order phase="p1" phaseFirst="true"/>
<parameter name="para8" locked="xsd:true">123</parameter>
@@ -12,7 +12,7 @@
<!--
<module ref="uri">
<parameter name="para3" locked="xsd:true">10</parameter>
- <parameter name="para4" locked="false">LSF</parameter>
+ <parameter name="para4">LSF</parameter>
</module>
-->
<phaseOrder>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/Badmodule.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/Badmodule.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/Badmodule.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/Badmodule.xml Wed Jun 27 09:45:37 2007
@@ -1,6 +1,6 @@
<module name="module1" class="module1.java">
<parameter name="para123" locked="xsd:true">10</parameter>
- <parameter name="para245" locked="false">Colombo</parameter>
+ <parameter name="para245">Colombo</parameter>
<!-- Module TypeMapping -->
<typeMapping>Type mappping should come here</typeMapping>
<InFlow>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,15 +2,15 @@
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">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>
<!-- The way of adding listener to the system-->
<listener class="org.apache.axis2.deployment.AxisObserverImpl">
- <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>
@@ -24,20 +24,20 @@
<!-- Transport Ins -->
<!-- ================================================= -->
<transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<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> -->
<transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port">6060</parameter>
</transportReceiver>
<!-- ================================================= -->
@@ -48,14 +48,14 @@
<transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
+ <parameter name="PROTOCOL">HTTP/1.0</parameter>
</transportSender>
<!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
<transportSender name="mail" 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>
-->
@@ -72,18 +72,18 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
</phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -101,16 +101,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml Wed Jun 27 09:45:37 2007
@@ -226,21 +226,21 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
</phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -261,17 +261,17 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
<handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.engine.HTTPLocationBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/ParaLockedRepo/axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,28 +2,28 @@
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
- <parameter name="ServicePara1" locked="false">true</parameter>
+ <parameter name="ServicePara1">true</parameter>
<parameter name="ServicePara2" locked="true">true</parameter>
- <parameter name="modulePara1" locked="false">true</parameter>
+ <parameter name="modulePara1">true</parameter>
<parameter name="modulePara2" locked="true">true</parameter>
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
</phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -41,16 +41,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/SystemPhaseRemove/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/SystemPhaseRemove/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/SystemPhaseRemove/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/SystemPhaseRemove/axis2.xml Wed Jun 27 09:45:37 2007
@@ -1,12 +1,12 @@
<axisconfig name="AxisJava2.0">
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">true</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">true</parameter>
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
+ <parameter name="PROTOCOL">HTTP/1.0</parameter>
</transportSender>
<phaseOrder type="InFlow">
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/axis2.xml Wed Jun 27 09:45:37 2007
@@ -1,29 +1,29 @@
<axisconfig name="AxisJava2.0">
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">true</parameter>
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">true</parameter>
<parameter name="FavoriteColor">purple</parameter>
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>
+ <parameter name="PROTOCOL">HTTP/1.0</parameter>
</transportSender>
<phaseOrder type="InFlow">
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
</phase>
<phase name="Security"/>
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -41,16 +41,16 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml Wed Jun 27 09:45:37 2007
@@ -20,52 +20,52 @@
<!-- ================================================= -->
<!-- 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 seconds-->
- <parameter name="ConfigContextTimeoutInterval" locked="false">30</parameter>
+ <parameter name="ConfigContextTimeoutInterval">30</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>-->
<!--Set the flag to true if you want to enable transport level session mangment-->
- <parameter name="manageTransportSession" locked="false">false</parameter>
+ <parameter name="manageTransportSession">false</parameter>
<!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two-->
<!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following-->
@@ -82,12 +82,12 @@
<!-- 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>-->
<!-- ================================================= -->
@@ -120,7 +120,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)
@@ -135,53 +135,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 -->
<!-- ================================================= -->
@@ -194,13 +194,13 @@
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>
</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"
@@ -209,10 +209,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>
-->
@@ -224,7 +224,7 @@
<!--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>-->
<!-- ================================================= -->
@@ -234,11 +234,11 @@
<!-- System pre defined phases -->
<phase name="Transport">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
<order phase="Transport"/>
</handler>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
<order phase="Transport"/>
</handler>
</phase>
@@ -246,12 +246,12 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- System pre defined phases -->
<!-- After Postdispatch phase module author or or service author can add any phase he want -->
@@ -272,18 +272,18 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
<handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
<handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/>
<handler name="RequestURIOperationDispatcher"
- class="org.apache.axis2.engine.RequestURIOperationDispatcher"/>
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher"/>
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
</phase>
<!-- user can add his own phases to this area -->
<phase name="OperationInFaultPhase"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org