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 az...@apache.org on 2006/07/06 07:10:29 UTC
svn commit: r419438 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/ServiceBuilder.java description/AxisService.java
engine/DispatchPhase.java engine/ListenerManager.java
transport/njms/JMSUtils.java
Author: azeez
Date: Wed Jul 5 22:10:29 2006
New Revision: 419438
URL: http://svn.apache.org/viewvc?rev=419438&view=rev
Log:
1. Added isExposedTransport method to AxisService
2. Changed type of exposedTransports to List
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=419438&r1=419437&r2=419438&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Wed Jul 5 22:10:29 2006
@@ -189,7 +189,7 @@
OMElement trsEle = (OMElement) transport_itr.next();
trs.add(trsEle.getText());
}
- service.setExposedTransports((String[]) trs.toArray(new String[trs.size()]));
+ service.setExposedTransports(trs);
}
// processing operations
Iterator operationsIterator =
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=419438&r1=419437&r2=419438&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Wed Jul 5 22:10:29 2006
@@ -361,8 +361,9 @@
}
if (service != null) {
messageReceiver = service.getMessageReceiver(mepURL);
- if (messageReceiver != null)
+ if (messageReceiver != null) {
return messageReceiver;
+ }
}
if (getParent() != null && getParent().getParent() != null) {
return ((AxisConfiguration) getParent().getParent()).getMessageReceiver(mepURL);
@@ -401,8 +402,8 @@
operation.setOutputAction(axisOperation.getOutputAction());
String[] faultActionNames = axisOperation.getFaultActionNames();
- for(int i=0;i<faultActionNames.length;i++){
- operation.addFaultAction(faultActionNames[i],axisOperation.getFaultAction(faultActionNames[i]));
+ for (int i = 0; i < faultActionNames.length; i++) {
+ operation.addFaultAction(faultActionNames[i], axisOperation.getFaultAction(faultActionNames[i]));
}
return operation;
@@ -508,7 +509,9 @@
}
public AxisConfiguration getAxisConfiguration() {
- if (getParent() != null) return (AxisConfiguration) getParent().getParent();
+ if (getParent() != null) {
+ return (AxisConfiguration) getParent().getParent();
+ }
return null;
}
@@ -539,9 +542,9 @@
}
}
} else {
- String trs [] = getExposedTransports();
- for (int i = 0; i < trs.length; i++) {
- String trsName = trs[i];
+ List trs = getExposedTransports();
+ for (int i = 0; i < trs.size(); i++) {
+ String trsName = (String) trs.get(i);
TransportInDescription transportIn = axisConfig.getTransportIn(
new QName(trsName));
if (transportIn != null) {
@@ -977,26 +980,27 @@
return enableAllTransport;
}
- public String[] getExposedTransports() {
- return (String[]) (exposedTransports.toArray(new String[exposedTransports.size()]));
+ public List getExposedTransports() {
+ return this.exposedTransports;
}
- public void setExposedTransports(String[] transports) {
- if (transports.length > 0) {
+ public void setExposedTransports(List transports) {
+ if (transports.size() > 0) {
enableAllTransport = false;
- this.exposedTransports = new Vector();
- for (int i = 0; i < transports.length; i++) {
- this.exposedTransports.add(transports[i]);
- }
+ this.exposedTransports = transports;
}
}
- public void addExposedTransport(String transport){
+ public void addExposedTransport(String transport) {
this.exposedTransports.add(transport);
}
- public void removeExposedTransport(String transport){
+ public void removeExposedTransport(String transport) {
this.exposedTransports.remove(transport);
+ }
+
+ public boolean isExposedTransport(String transport) {
+ return exposedTransports.contains(transport);
}
public void disEngageModule(AxisModule module) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java?rev=419438&r1=419437&r2=419438&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java Wed Jul 5 22:10:29 2006
@@ -7,6 +7,7 @@
import org.apache.axis2.i18n.Messages;
import java.util.ArrayList;
+import java.util.List;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -79,10 +80,10 @@
if (service.isEnableAllTransport()) {
return;
} else {
- String trs [] = service.getExposedTransports();
+ List trs = service.getExposedTransports();
String incommingTrs = msgctx.getIncomingTransportName();
- for (int i = 0; i < trs.length; i++) {
- String tr = trs[i];
+ for (int i = 0; i < trs.size(); i++) {
+ String tr = (String) trs.get(i);
if (incommingTrs != null && incommingTrs.equals(tr)) {
return;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java?rev=419438&r1=419437&r2=419438&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java Wed Jul 5 22:10:29 2006
@@ -17,6 +17,7 @@
import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -78,9 +79,9 @@
return null;
}
} else {
- String exposeTransport [] = service.getExposedTransports();
+ List exposeTransport = service.getExposedTransports();
TransportListener listener = (TransportListener)
- startedTransports.get(exposeTransport[0]);
+ startedTransports.get(exposeTransport.get(0));
if (opName == null) {
return listener.getEPRForService(serviceName, null);
} else return listener.getEPRForService(serviceName + "/" + opName, null);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java?rev=419438&r1=419437&r2=419438&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/njms/JMSUtils.java Wed Jul 5 22:10:29 2006
@@ -46,6 +46,7 @@
import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
import java.util.StringTokenizer;
+import java.util.List;
public class JMSUtils {
@@ -62,16 +63,16 @@
return true;
} else {
- String[] transports = service.getExposedTransports();
- for (int i=0; i<transports.length; i++) {
- if (Constants.TRANSPORT_JMS.equals(transports[i])) {
+ List transports = service.getExposedTransports();
+ for (int i=0; i<transports.size(); i++) {
+ if (Constants.TRANSPORT_JMS.equals(transports.get(i))) {
return true;
}
}
}
return false;
}
-
+
/**
* Get the JMS destination used by this service
* @param service the Axis Service
@@ -121,7 +122,7 @@
* @param axisCfg configuration context
*/
public static void markServiceAsFaulty(String serviceName, String msg,
- AxisConfiguration axisCfg ) {
+ AxisConfiguration axisCfg ) {
if (serviceName != null) {
try {
AxisService service = axisCfg.getService(serviceName);
@@ -129,7 +130,7 @@
} catch (AxisFault axisFault) {
log.warn("Error marking service : " + serviceName +
- " as faulty due to : " + msg, axisFault);
+ " as faulty due to : " + msg, axisFault);
}
}
}
@@ -169,7 +170,7 @@
} else {
handleException("Unsupported JMS message type : " +
- message.getClass().getName());
+ message.getClass().getName());
}
@@ -305,11 +306,11 @@
// If charset is not specified
if (TransportUtils.getCharSetEncoding(contentType) == null) {
xmlreader = StAXUtils.createXMLStreamReader(in,
- MessageContext.DEFAULT_CHAR_SET_ENCODING);
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
- MessageContext.DEFAULT_CHAR_SET_ENCODING);
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
} else {
// get the type of char encoding
@@ -323,12 +324,12 @@
if (contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) > -1) {
// it is SOAP 1.2
builder = new StAXSOAPModelBuilder(xmlreader,
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
envelope = (SOAPEnvelope) builder.getDocumentElement();
} else if (contentType.indexOf(SOAP11Constants.SOAP_11_CONTENT_TYPE) > -1) {
// SOAP 1.1
builder = new StAXSOAPModelBuilder(xmlreader,
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
}
@@ -336,11 +337,11 @@
if (builder == null) {
XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(in,
- MessageContext.DEFAULT_CHAR_SET_ENCODING);
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
// Set the encoding scheme in the message context
msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING,
- MessageContext.DEFAULT_CHAR_SET_ENCODING);
+ MessageContext.DEFAULT_CHAR_SET_ENCODING);
builder = new StAXSOAPModelBuilder(
xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
envelope = (SOAPEnvelope) builder.getDocumentElement();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org