Author: veithen
Date: Sun Jun 14 15:36:37 2009
New Revision: 784573
URL: http://svn.apache.org/viewvc?rev=784573&view=rev
Log:
Added a listener attribute to ProtocolEndpoint.
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramEndpoint.java
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=784573&r1=784572&r2=784573&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
Sun Jun 14 15:36:37 2009
@@ -107,7 +107,7 @@
@Override
protected final void startListeningForService(AxisService service) throws
AxisFault {
E endpoint = createEndpoint();
- endpoint.setService(service);
+ endpoint.init(this, service);
if (endpoint.loadConfiguration(service)) {
startEndpoint(endpoint);
endpoints.add(endpoint);
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java?rev=784573&r1=784572&r2=784573&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
Sun Jun 14 15:36:37 2009
@@ -29,18 +29,24 @@
* service.
*/
public abstract class ProtocolEndpoint {
+ private AbstractTransportListenerEx<?> listener;
/** Axis2 service */
private AxisService service;
+ // This is called only by AbstractTransportListenerEx and must have
package access
+ void init(AbstractTransportListenerEx<?> listener, AxisService service) {
+ this.listener = listener;
+ this.service = service;
+ }
+
+ public final AbstractTransportListenerEx<?> getListener() {
+ return listener;
+ }
+
public final AxisService getService() {
return service;
}
- // TODO: this should only be called by AbstractTransportListener and
declared with package access
- public final void setService(AxisService service) {
- this.service = service;
- }
-
public final String getServiceName() {
return service.getName();
}
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java?rev=784573&r1=784572&r2=784573&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
Sun Jun 14 15:36:37 2009
@@ -57,7 +57,6 @@
@Override
protected final E createEndpoint() {
E endpoint = doCreateEndpoint();
- endpoint.setListener(this);
endpoint.setMetrics(metrics);
return endpoint;
}
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramEndpoint.java?rev=784573&r1=784572&r2=784573&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramEndpoint.java
Sun Jun 14 15:36:37 2009
@@ -33,18 +33,9 @@
* the transport listens on.
*/
public abstract class DatagramEndpoint extends ProtocolEndpoint {
- private AbstractDatagramTransportListener listener;
private String contentType;
private MetricsCollector metrics;
- public AbstractDatagramTransportListener getListener() {
- return listener;
- }
-
- public void setListener(AbstractDatagramTransportListener listener) {
- this.listener = listener;
- }
-
public String getContentType() {
return contentType;
}
@@ -60,7 +51,7 @@
@Override
public boolean loadConfiguration(ParameterInclude params) throws AxisFault
{
contentType = ParamUtils.getRequiredParam(
- params, "transport." + listener.getTransportName() +
".contentType");
+ params, "transport." + getListener().getTransportName() +
".contentType");
return true;
}
}
