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 2007/09/05 20:13:01 UTC
svn commit: r573017 [2/2] - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/interceptor/
api/src/main/java/org/apache/cxf/phase/
common/common/src/main/java/org/apache/cxf/common/commands/
common/common/src/main/java/org/apache/cxf/common/log...
Modified: incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java Wed Sep 5 11:12:51 2007
@@ -28,6 +28,7 @@
import javax.xml.ws.Service;
+import org.apache.cxf.common.logging.LogUtils;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
import org.mozilla.javascript.Script;
@@ -39,7 +40,7 @@
public static final String NO_SUCH_FILE = ": file does not exist";
public static final String NO_PROVIDER = ": file contains no WebServiceProviders";
- private static final Logger LOG = Logger.getLogger(ProviderFactory.class.getName());
+ private static final Logger LOG = LogUtils.getL7dLogger(ProviderFactory.class);
private String epAddress;
private boolean isBaseAddr;
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Wed Sep 5 11:12:51 2007
@@ -32,6 +32,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -47,7 +48,7 @@
public class ServletController {
- private static final Logger LOG = Logger.getLogger(ServletController.class.getName());
+ private static final Logger LOG = LogUtils.getL7dLogger(ServletController.class);
private ServletTransportFactory transport;
private CXFServlet cxfServlet;
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java Wed Sep 5 11:12:51 2007
@@ -25,6 +25,7 @@
import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.ConduitInitiator;
@@ -34,7 +35,7 @@
public class ServletDestination extends AbstractHTTPDestination {
- static final Logger LOG = Logger.getLogger(ServletDestination.class.getName());
+ static final Logger LOG = LogUtils.getL7dLogger(ServletDestination.class);
private static final long serialVersionUID = 1L;
Modified: incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java (original)
+++ incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java Wed Sep 5 11:12:51 2007
@@ -31,6 +31,7 @@
import javax.annotation.Resource;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.AbstractTransportFactory;
@@ -46,7 +47,7 @@
public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/local";
- private static final Logger LOG = Logger.getLogger(LocalTransportFactory.class.getName());
+ private static final Logger LOG = LogUtils.getL7dLogger(LocalTransportFactory.class);
private static final Set<String> URI_PREFIXES = new HashSet<String>();
static {
Modified: incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Wed Sep 5 11:12:51 2007
@@ -39,6 +39,7 @@
import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
@@ -61,7 +62,7 @@
public static final String TIMESTAMP_RESULT = "wss4j.timestamp.result";
public static final String SIGNATURE_RESULT = "wss4j.signature.result";
- private static final Logger LOG = Logger.getLogger(WSS4JInInterceptor.class.getName());
+ private static final Logger LOG = LogUtils.getL7dLogger(WSS4JInInterceptor.class);
private static final Logger TIME_LOG = Logger.getLogger(WSS4JInInterceptor.class.getName() + "-Time");
public WSS4JInInterceptor() {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Wed Sep 5 11:12:51 2007
@@ -88,7 +88,17 @@
port = service.getPort(portName, DocLitBareCodeFirstService.class);
resp = port.greetMe(req);
assertEquals(req.getName(), resp.getName());
- }
+
+ //try the fault
+ req.setName("fault");
+ try {
+ resp = port.greetMe(req);
+ fail("did not get fault back");
+ } catch (SOAPFaultException ex) {
+ assertEquals("mr.actor", ex.getFault().getFaultActor());
+ assertEquals("test", ex.getFault().getDetail().getFirstChild().getLocalName());
+ }
+ }
@Test
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitBareCodeFirstServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitBareCodeFirstServiceImpl.java?rev=573017&r1=573016&r2=573017&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitBareCodeFirstServiceImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitBareCodeFirstServiceImpl.java Wed Sep 5 11:12:51 2007
@@ -20,6 +20,12 @@
package org.apache.cxf.systest.jaxws;
import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPFault;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.soap.SOAPFaultException;
@WebService(endpointInterface = "org.apache.cxf.systest.jaxws.DocLitBareCodeFirstService",
serviceName = "DocLitBareCodeFirstService",
@@ -28,6 +34,19 @@
public class DocLitBareCodeFirstServiceImpl implements DocLitBareCodeFirstService {
public GreetMeResponse greetMe(GreetMeRequest gmr) {
+ if ("fault".equals(gmr.getName())) {
+ try {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPFault fault = factory.createFault("this is a fault string!",
+ new QName("http://foo", "FooCode"));
+ fault.setFaultActor("mr.actor");
+ fault.addDetail().addChildElement("test").addTextNode("TestText");
+ throw new SOAPFaultException(fault);
+ } catch (SOAPException ex) {
+ throw new WebServiceException(ex);
+ }
+ }
+
GreetMeResponse resp = new GreetMeResponse();
resp.setName(gmr.getName());
return resp;