Author: dkulp
Date: Tue Oct 7 14:33:19 2008
New Revision: 702643
URL: http://svn.apache.org/viewvc?rev=702643&view=rev
Log:
Merged revisions 701830 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r701830 | gmazza | 2008-10-05 13:10:50 -0400 (Sun, 05 Oct 2008) | 1 line
Comment added on how ApplicationContext is made available to CXFServlet.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 7 14:33:19 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,702267,702547,702561,702580,702602,702609
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,702267,702547,702561,702580,702602,702609
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?rev=702643&r1=702642&r2=702643&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Tue Oct 7 14:33:19 2008
@@ -92,7 +92,7 @@
if (ctxObject instanceof ApplicationContext) {
ctx = (ApplicationContext) ctxObject;
} else if (ctxObject != null) {
- // it should be the runtime exception
+ // it should be a runtime exception
Exception ex = (Exception) ctxObject;
throw new ServletException(ex);
}
@@ -105,8 +105,13 @@
}
}
private void updateContext(ServletConfig servletConfig, ApplicationContext
ctx) {
- // This constructor works whether there is a context or not
- // If the ctx is null, we just start up the default bus
+ /* If ctx is null, normally no ContextLoaderListener
+ * was defined in web.xml. Default bus with all extensions
+ * will be created in this case.
+ *
+ * If ctx not null, was already created by ContextLoaderListener.
+ * Bus with only those extensions defined in the ctx will be created.
+ */
if (ctx == null) {
LOG.info("LOAD_BUS_WITHOUT_APPLICATION_CONTEXT");
bus = new SpringBusFactory().createBus();
