You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/06/15 19:42:50 UTC
svn commit: r667981 - in
/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport:
amqp/ base/ base/datagram/ fix/ jms/ mail/ udp/ vfs/
Author: veithen
Date: Sun Jun 15 10:42:49 2008
New Revision: 667981
URL: http://svn.apache.org/viewvc?rev=667981&view=rev
Log:
SYNAPSE-320: use "name" property of TransportInDescription/TransportOutDescription instead of hardcoded transport name.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/AbstractDatagramTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java Sun Jun 15 10:42:49 2008
@@ -37,7 +37,6 @@
@Override
public void init(ConfigurationContext cfgCtx, TransportInDescription transportIn) throws AxisFault
{
- setTransportName(TRANSPORT_NAME);
super.init(cfgCtx, transportIn);
loadConnectionDefinitions(transportIn);
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java Sun Jun 15 10:42:49 2008
@@ -39,7 +39,6 @@
@Override
public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut) throws AxisFault {
- setTransportName(TRANSPORT_NAME);
super.init(cfgCtx, transportOut);
// init connections
}
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java Sun Jun 15 10:42:49 2008
@@ -64,7 +64,7 @@
public void run() {
if (pollInProgress) {
if (log.isDebugEnabled()) {
- log.debug("Transport " + transportName +
+ log.debug("Transport " + getTransportName() +
" onPoll() trigger : already executing poll..");
}
return;
@@ -72,7 +72,7 @@
if (state == BaseConstants.PAUSED) {
if (log.isDebugEnabled()) {
- log.debug("Transport " + transportName +
+ log.debug("Transport " + getTransportName() +
" onPoll() trigger : Transport is currently paused..");
}
return;
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportListener.java Sun Jun 15 10:42:49 2008
@@ -47,8 +47,6 @@
/** the reference to the actual commons logger to be used for log messages */
protected Log log = null;
- /** the name of the transport */
- protected String transportName = null;
/** the axis2 configuration context */
protected ConfigurationContext cfgCtx = null;
/** an axis2 engine over the above configuration context to process messages */
@@ -93,14 +91,14 @@
this.cfgCtx = cfgCtx;
this.engine = new AxisEngine(cfgCtx);
this.transportIn = transportIn;
- this.transportOut = cfgCtx.getAxisConfiguration().getTransportOut(transportName);
+ this.transportOut = cfgCtx.getAxisConfiguration().getTransportOut(getTransportName());
if (useAxis2ThreadPool) {
//this.workerPool = cfgCtx.getThreadPool(); not yet implemented
throw new AxisFault("Unsupported thread pool for task execution - Axis2 thread pool");
} else {
this.workerPool = WorkerPoolFactory.getWorkerPool(
- 10, 20, 5, -1, transportName + "Server Worker thread group", transportName + "-Worker");
+ 10, 20, 5, -1, getTransportName() + "Server Worker thread group", getTransportName() + "-Worker");
}
// register to receive updates on services for lifetime management
@@ -116,7 +114,7 @@
try {
stop();
} catch (AxisFault ignore) {
- log.warn("Error stopping the transport : " + transportName);
+ log.warn("Error stopping the transport : " + getTransportName());
}
}
} finally {
@@ -135,7 +133,7 @@
state = BaseConstants.STOPPED;
// cancel receipt of service lifecycle events
cfgCtx.getAxisConfiguration().getObserversList().remove(axisObserver);
- log.info(transportName.toUpperCase() + " Listener Shutdown");
+ log.info(getTransportName().toUpperCase() + " Listener Shutdown");
for (AxisService service : getListeningServices()) {
internalStopListeningForService(service);
}
@@ -147,7 +145,7 @@
state = BaseConstants.STARTED;
// register to receive updates on services for lifetime management
// cfgCtx.getAxisConfiguration().addObservers(axisObserver);
- log.info(transportName.toUpperCase() + " Listener started");
+ log.info(getTransportName().toUpperCase() + " Listener started");
// iterate through deployed services and start
for (AxisService service : getListeningServices()) {
internalStartListeningForService(service);
@@ -167,7 +165,7 @@
while (services.hasNext()) {
AxisService service = (AxisService) services.next();
if (!ignoreService(service)
- && BaseUtils.isUsingTransport(service, transportName)) {
+ && BaseUtils.isUsingTransport(service, getTransportName())) {
result.add(service);
}
}
@@ -233,7 +231,7 @@
MessageContext msgCtx = new MessageContext();
msgCtx.setConfigurationContext(cfgCtx);
- msgCtx.setIncomingTransportName(transportName);
+ msgCtx.setIncomingTransportName(getTransportName());
msgCtx.setTransportOut(transportOut);
msgCtx.setTransportIn(transportIn);
msgCtx.setServerSide(true);
@@ -300,11 +298,7 @@
}
public String getTransportName() {
- return transportName;
- }
-
- public void setTransportName(String transportName) {
- this.transportName = transportName;
+ return transportIn.getName();
}
public MetricsCollector getMetricsCollector() {
@@ -324,7 +318,7 @@
public void serviceUpdate(AxisEvent event, AxisService service) {
if (!ignoreService(service)
- && BaseUtils.isUsingTransport(service, transportName)) {
+ && BaseUtils.isUsingTransport(service, getTransportName())) {
switch (event.getEventType()) {
case AxisEvent.SERVICE_DEPLOY :
internalStartListeningForService(service);
@@ -437,7 +431,7 @@
if (jmxAgentName == null || "".equals(jmxAgentName)) {
jmxAgentName = "org.apache.synapse";
}
- return jmxAgentName + ":Type=Transport,ConnectorName=" + transportName + "-listener";
+ return jmxAgentName + ":Type=Transport,ConnectorName=" + getTransportName() + "-listener";
}
private String getEndpointMBeanName(String serviceName) {
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java Sun Jun 15 10:42:49 2008
@@ -46,8 +46,6 @@
/** the reference to the actual commons logger to be used for log messages */
protected Log log = null;
- /** the name of the transport */
- protected String transportName = null;
/** the axis2 configuration context */
protected ConfigurationContext cfgCtx = null;
/** an axis2 engine over the above configuration context to process messages */
@@ -72,8 +70,8 @@
throws AxisFault {
this.cfgCtx = cfgCtx;
this.engine = new AxisEngine(cfgCtx);
- this.transportIn = cfgCtx.getAxisConfiguration().getTransportIn(transportName);
this.transportOut = transportOut;
+ this.transportIn = cfgCtx.getAxisConfiguration().getTransportIn(getTransportName());
this.state = BaseConstants.STARTED;
// register with JMX
@@ -85,19 +83,19 @@
String name;
try {
name = jmxAgentName + ":Type=Transport,ConnectorName=" +
- transportName + "-sender";
+ getTransportName() + "-sender";
TransportView tBean = new TransportView(null, this);
registerMBean(mbs, tBean, name);
} catch (Exception e) {
- log.warn("Error registering the " + transportName + " transport for JMX management", e);
+ log.warn("Error registering the " + getTransportName() + " transport for JMX management", e);
}
- log.info(transportName.toUpperCase() + " Sender started");
+ log.info(getTransportName().toUpperCase() + " Sender started");
}
public void stop() {
if (state != BaseConstants.STARTED) return;
state = BaseConstants.STOPPED;
- log.info(transportName.toUpperCase() + " Sender Shutdown");
+ log.info(getTransportName().toUpperCase() + " Sender Shutdown");
}
public void cleanup(MessageContext msgContext) throws AxisFault {}
@@ -189,7 +187,7 @@
responseMsgCtx.setOperationContext(outMsgCtx.getOperationContext());
}
- responseMsgCtx.setIncomingTransportName(transportName);
+ responseMsgCtx.setIncomingTransportName(getTransportName());
responseMsgCtx.setTransportOut(transportOut);
responseMsgCtx.setTransportIn(transportIn);
@@ -226,11 +224,7 @@
}
public String getTransportName() {
- return transportName;
- }
-
- public void setTransportName(String transportName) {
- this.transportName = transportName;
+ return transportOut.getName();
}
protected void handleException(String msg, Exception e) throws AxisFault {
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/AbstractDatagramTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/AbstractDatagramTransportListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/AbstractDatagramTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/datagram/AbstractDatagramTransportListener.java Sun Jun 15 10:42:49 2008
@@ -39,7 +39,6 @@
@Override
public void init(ConfigurationContext cfgCtx, TransportInDescription transportIn) throws AxisFault {
- setTransportName(transportIn.getName());
super.init(cfgCtx, transportIn);
DatagramDispatcherCallback callback = new DatagramDispatcherCallback() {
public void receive(DatagramEndpoint endpoint, byte[] data, int length) {
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportListener.java Sun Jun 15 10:42:49 2008
@@ -60,7 +60,6 @@
public void init(ConfigurationContext cfgCtx,
TransportInDescription trpInDesc) throws AxisFault {
- setTransportName(FIXConstants.TRANSPORT_NAME);
super.init(cfgCtx, trpInDesc);
//initialize the FIXSessionFactory
fixSessionFactory = new FIXSessionFactory(new FIXApplicationFactory(this.cfgCtx, this.workerPool));
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/fix/FIXTransportSender.java Sun Jun 15 10:42:49 2008
@@ -67,7 +67,6 @@
* @throws AxisFault on error
*/
public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut) throws AxisFault {
- setTransportName(FIXConstants.TRANSPORT_NAME);
super.init(cfgCtx, transportOut);
messageSender = new FIXOutgoingMessageHandler();
log.info("FIX transport sender initialized...");
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java Sun Jun 15 10:42:49 2008
@@ -72,7 +72,6 @@
*/
public void init(ConfigurationContext cfgCtx,
TransportInDescription trpInDesc) throws AxisFault {
- setTransportName(TRANSPORT_NAME);
super.init(cfgCtx, trpInDesc);
// read the connection factory definitions and create them
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java Sun Jun 15 10:42:49 2008
@@ -64,7 +64,6 @@
* @throws AxisFault on error
*/
public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut) throws AxisFault {
- setTransportName(TRANSPORT_NAME);
super.init(cfgCtx, transportOut);
// read the connection factory definitions and create them
loadConnectionFactoryDefinitions(transportOut);
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java Sun Jun 15 10:42:49 2008
@@ -72,7 +72,6 @@
*/
public void init(ConfigurationContext cfgCtx, TransportInDescription trpInDesc)
throws AxisFault {
- setTransportName(MailConstants.TRANSPORT_NAME);
super.init(cfgCtx, trpInDesc);
}
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportSender.java Sun Jun 15 10:42:49 2008
@@ -77,7 +77,6 @@
* @throws org.apache.axis2.AxisFault on error
*/
public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut) throws AxisFault {
- setTransportName(MailConstants.TRANSPORT_NAME);
super.init(cfgCtx, transportOut);
// initialize SMTP session
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/udp/UDPSender.java Sun Jun 15 10:42:49 2008
@@ -47,7 +47,6 @@
@Override
public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut) throws AxisFault {
- setTransportName(transportOut.getName());
super.init(cfgCtx, transportOut);
}
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java Sun Jun 15 10:42:49 2008
@@ -121,7 +121,6 @@
*/
public void init(ConfigurationContext cfgCtx, TransportInDescription trpInDesc)
throws AxisFault {
- setTransportName(TRANSPORT_NAME);
super.init(cfgCtx, trpInDesc);
try {
StandardFileSystemManager fsm = new StandardFileSystemManager();
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java?rev=667981&r1=667980&r2=667981&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java Sun Jun 15 10:42:49 2008
@@ -58,7 +58,6 @@
* @throws AxisFault on error
*/
public void init(ConfigurationContext cfgCtx, TransportOutDescription transportOut) throws AxisFault {
- setTransportName(TRANSPORT_NAME);
super.init(cfgCtx, transportOut);
try {
StandardFileSystemManager fsm = new StandardFileSystemManager();