You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/05/02 19:34:57 UTC
svn commit: r534562 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Author: dims
Date: Wed May 2 10:34:56 2007
New Revision: 534562
URL: http://svn.apache.org/viewvc?view=rev&rev=534562
Log:
Tweak Simple Deployment scenario - User should be able to add web services support to their own war by just dropping axis2 jars in the WEB-INF and axis2.xml/*.wsdl/*.xsd/services.xml in WEB-INF
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=534562&r1=534561&r2=534562
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Wed May 2 10:34:56 2007
@@ -121,6 +121,13 @@
.getResourceAsStream("/WEB-INF/conf/axis2.xml");
log.debug("trying to load axis2.xml from module: /WEB-INF/conf/axis2.xml");
}
+
+ if (axis2Stream == null) {
+ // Simple deployment, no need for conf directory either
+ axis2Stream = config.getServletContext()
+ .getResourceAsStream("/WEB-INF/axis2.xml");
+ log.debug("trying to load axis2.xml from module: /WEB-INF/conf/axis2.xml");
+ }
} // try
catch (Exception e) {
log.error(e, e);
@@ -130,6 +137,8 @@
} // catch
if (axis2Stream == null) {
+ log.info("Could not find axis2.xml, loading default "
+ + DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE + " from classpath");
axis2Stream =
Loader.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org