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 gd...@apache.org on 2009/07/31 05:17:17 UTC
svn commit: r799504 - in /webservices/axis2/branches/java/1_5/modules:
integration/test/org/apache/axis2/integration/
kernel/src/org/apache/axis2/client/ kernel/src/org/apache/axis2/context/
kernel/src/org/apache/axis2/deployment/ transport/http/src/or...
Author: gdaniels
Date: Fri Jul 31 03:17:16 2009
New Revision: 799504
URL: http://svn.apache.org/viewvc?rev=799504&view=rev
Log:
Enable the transport deployer to actually work by rejiggering getListenerManager() in ConfigurationContext so that it creates a ListenerManager if one isn't already present (this was generating a hidden NPE before).
TODO : Test for TransportDeployer!
Remove instances of "if (listenerManager == null) ..." since they're now redundant.
Allow directories (exploded jars) to be used by custom deployers.
Modified:
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java
Modified: webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=799504&r1=799503&r2=799504&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilServer.java Fri Jul 31 03:17:16 2009
@@ -82,10 +82,6 @@
ListenerManager listenerManager = er.getListenerManager();
TransportInDescription trsIn = new TransportInDescription(Constants.TRANSPORT_HTTP);
trsIn.setReceiver(receiver);
- if (listenerManager == null) {
- listenerManager = new ListenerManager();
- listenerManager.init(er);
- }
listenerManager.addListener(trsIn, true);
System.out.print("Server started on port "
+ TESTING_PORT + ".....");
Modified: webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?rev=799504&r1=799503&r2=799504&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Fri Jul 31 03:17:16 2009
@@ -155,11 +155,8 @@
hashCode = (int)anonServiceCounter.incrementAndGet();
// Initialize transports
- ListenerManager transportManager = configContext.getListenerManager();
- if (transportManager == null) {
- transportManager = new ListenerManager();
- transportManager.init(this.configContext);
- }
+ // TODO : do we need this?
+ configContext.getListenerManager();
// save the axisConfig and service
axisConfig = configContext.getAxisConfiguration();
Modified: webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=799504&r1=799503&r2=799504&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Fri Jul 31 03:17:16 2009
@@ -686,6 +686,12 @@
* @return Returns the ListenerManager
*/
public ListenerManager getListenerManager() {
+ synchronized (this) {
+ if (listenerManager == null) {
+ listenerManager = new ListenerManager();
+ listenerManager.init(this);
+ }
+ }
return listenerManager;
}
Modified: webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?rev=799504&r1=799503&r2=799504&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Fri Jul 31 03:17:16 2009
@@ -279,8 +279,7 @@
if (isSourceControlDir(file)) {
continue;
}
- if (!file.isDirectory() && extension
- .equals(DeploymentFileData.getFileExtension(file.getName()))) {
+ if (extension.equals(DeploymentFileData.getFileExtension(file.getName()))) {
addFileToDeploy(file,
deploymentEngine.getDeployer(dir, extension),
WSInfo.TYPE_CUSTOM);
Modified: webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=799504&r1=799503&r2=799504&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Fri Jul 31 03:17:16 2009
@@ -169,13 +169,9 @@
SimpleHTTPServer receiver = new SimpleHTTPServer(configctx, port);
Runtime.getRuntime().addShutdownHook(new ShutdownThread(receiver));
receiver.start();
- ListenerManager listenerManager = configctx .getListenerManager();
TransportInDescription trsIn = new TransportInDescription(Constants.TRANSPORT_HTTP);
trsIn.setReceiver(receiver);
- if (listenerManager == null) {
- listenerManager = new ListenerManager();
- listenerManager.init(configctx);
- }
+ ListenerManager listenerManager = configctx.getListenerManager();
listenerManager.addListener(trsIn, true);
// should all transports be started? specified as "-t all"
Modified: webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java?rev=799504&r1=799503&r2=799504&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java (original)
+++ webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java Fri Jul 31 03:17:16 2009
@@ -210,12 +210,7 @@
* Return the configured listener manager or create and configure one with configurationContext
*/
public ListenerManager getListenerManager() {
- ListenerManager lm = configurationContext.getListenerManager();
- if (lm == null) {
- lm = new ListenerManager();
- lm.init(configurationContext);
- }
- return lm;
+ return configurationContext.getListenerManager();
}
/**