Author: dkulp Date: Wed Oct 8 07:41:39 2008 New Revision: 702895 URL: http://svn.apache.org/viewvc?rev=702895&view=rev Log: Merged revisions 702643 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r702643 | dkulp | 2008-10-07 17:33:19 -0400 (Tue, 07 Oct 2008) | 9 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 8 07:41:39 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,702267,702580,702602,702609 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,702267,702580,702602,702609 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?rev=702895&r1=702894&r2=702895&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Wed Oct 8 07:41:39 2008 @@ -91,7 +91,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); } @@ -104,8 +104,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();
