Author: keith Date: Wed Aug 6 08:41:22 2008 New Revision: 20485 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20485
Log: Fixing epr in XMPP transport. Mashup-1068 Modified: branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/transport/xmpp/XMPPListener.java Modified: branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/transport/xmpp/XMPPListener.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/transport/xmpp/XMPPListener.java?rev=20485&r1=20484&r2=20485&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/transport/xmpp/XMPPListener.java (original) +++ branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/transport/xmpp/XMPPListener.java Wed Aug 6 08:41:22 2008 @@ -49,7 +49,7 @@ public class XMPPListener implements TransportListener { private static Log log = LogFactory.getLog(XMPPListener.class); private ConfigurationContext configurationContext = null; - private String replyTo = ""; + private String xmppServerUsername = ""; /** * A Map containing the connection factories managed by this, @@ -76,7 +76,7 @@ throws AxisFault { log.info("Initializing XMPPListener..."); configurationContext = configurationCtx; - initializeConnectionFactories(configurationContext,transportIn); + initializeConnectionFactories(transportIn); if (connectionFactories.isEmpty()) { log.warn("No XMPP connection factories defined." + "Will not listen for any XMPP messages"); @@ -90,9 +90,7 @@ * @param configurationContext * @param transportIn */ - private void initializeConnectionFactories( - ConfigurationContext configurationContext, - TransportInDescription transportIn) throws AxisFault{ + private void initializeConnectionFactories(TransportInDescription transportIn) throws AxisFault{ Iterator serversToListenOn = transportIn.getParameters().iterator(); while (serversToListenOn.hasNext()) { @@ -114,7 +112,8 @@ if(XMPPConstants.XMPP_SERVER_URL.equals(param.getName())){ serverCredentials.setServerUrl((String)param.getValue()); }else if(XMPPConstants.XMPP_SERVER_USERNAME.equals(param.getName())){ - serverCredentials.setAccountName((String)param.getValue()); + xmppServerUsername = (String) param.getValue(); + serverCredentials.setAccountName(xmppServerUsername); }else if(XMPPConstants.XMPP_SERVER_PASSWORD.equals(param.getName())){ serverCredentials.setPassword((String)param.getValue()); }else if(XMPPConstants.XMPP_SERVER_TYPE.equals(param.getName())){ @@ -133,7 +132,7 @@ * Stop XMPP listener & disconnect from all XMPP Servers */ public void stop() { - if (workerPool != null || !workerPool.isShutdown()) { + if (workerPool != null && !workerPool.isShutdown()) { workerPool.shutdown(); } //TODO : Iterate through all connections in connectionFactories & call disconnect() @@ -155,8 +154,7 @@ */ public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault { return new EndpointReference[]{new EndpointReference(XMPPConstants.XMPP_PREFIX + - replyTo + "?" + configurationContext - .getServiceContextPath() + "/" + serviceName)}; + xmppServerUsername + "/" + serviceName)}; } _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
