You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/09/12 18:02:21 UTC
svn commit: r694718 - in /cxf/branches/2.0.x-fixes: ./
rt/frontend/jaxws/src/main/resources/META-INF/cxf/
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/
Author: dkulp
Date: Fri Sep 12 09:02:21 2008
New Revision: 694718
URL: http://svn.apache.org/viewvc?rev=694718&view=rev
Log:
Merged revisions 694717 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r694717 | dkulp | 2008-09-12 12:00:56 -0400 (Fri, 12 Sep 2008) | 10 lines
Merged revisions 694716 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r694716 | dkulp | 2008-09-12 11:59:00 -0400 (Fri, 12 Sep 2008) | 3 lines
[CXF-1782, CXF-1796] Updates to Servlet controller stuff to make it more subclassable
Reduce logging in fastinfoset plugin
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 09:02:21 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
-/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
+/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
+/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
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 12 09:02:21 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500,694466-694469,694472
+/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500,694466-694469,694472,694717
Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml?rev=694718&r1=694717&r2=694718&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml Fri Sep 12 09:02:21 2008
@@ -27,5 +27,7 @@
<bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver"
id="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/>
<bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
- id="org.apache.cxf.jaxws.context.WebServiceContextImpl"/>
+ id="org.apache.cxf.jaxws.context.WebServiceContextImpl" lazy-init="true"/>
+ <bean class="org.apache.cxf.jaxws.context.WebServiceContextImpl"
+ id="javax.xml.ws.WebServiceContext" lazy-init="true"/>
</beans>
Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java?rev=694718&r1=694717&r2=694718&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java Fri Sep 12 09:02:21 2008
@@ -53,7 +53,8 @@
public ServletController createServletController(ServletConfig servletConfig) {
String hideServiceList = servletConfig.getInitParameter("hide-service-list-page");
- ServletController newController = new ServletController(servletTransportFactory, this);
+ ServletController newController =
+ new ServletController(servletTransportFactory, this.getServletContext(), bus);
if (hideServiceList != null) {
newController.setHideServiceList(Boolean.valueOf(hideServiceList));
}
Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=694718&r1=694717&r2=694718&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Fri Sep 12 09:02:21 2008
@@ -29,6 +29,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -48,16 +49,18 @@
private static final Logger LOG = LogUtils.getL7dLogger(ServletController.class);
private ServletTransportFactory transport;
- private AbstractCXFServlet cxfServlet;
+ private ServletContext servletContext;
+ private Bus bus;
private String lastBase = "";
private boolean isHideServiceList;
private boolean disableAddressUpdates;
private String forcedBaseAddress;
private String serviceListStyleSheet;
- public ServletController(ServletTransportFactory df, AbstractCXFServlet servlet) {
+ public ServletController(ServletTransportFactory df, ServletContext context, Bus b) {
this.transport = df;
- this.cxfServlet = servlet;
+ this.servletContext = context;
+ this.bus = b;
df.setServletController(this);
}
@@ -130,7 +133,6 @@
}
} else {
ei = d.getEndpointInfo();
- Bus bus = cxfServlet.getBus();
if (null != request.getQueryString()
&& request.getQueryString().length() > 0
&& bus.getExtension(QueryHandlerRegistry.class) != null) {
@@ -182,7 +184,7 @@
return null;
}
- private void generateServiceList(HttpServletRequest request, HttpServletResponse response)
+ protected void generateServiceList(HttpServletRequest request, HttpServletResponse response)
throws IOException {
if (request.getParameter("stylesheet") != null) {
@@ -280,7 +282,7 @@
}
try {
- d.invoke(cxfServlet.getServletContext(), request, response);
+ d.invoke(servletContext, request, response);
} catch (IOException e) {
throw new ServletException(e);
} finally {