Author: dkulp
Date: Tue Aug 12 08:52:51 2008
New Revision: 685205
URL: http://svn.apache.org/viewvc?rev=685205&view=rev
Log:
[CXF-1726] Exclude all the various versions of bouncycastle so we only get the
one we want
Fix TCK test failure
Minor perf improvement in PhaseInterceptorChain
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
cxf/trunk/rt/ws/security/pom.xml
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=685205&r1=685204&r2=685205&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Tue Aug 12 08:52:51 2008
@@ -208,18 +208,16 @@
@SuppressWarnings("unchecked")
public synchronized boolean doIntercept(Message message) {
updateIterator();
-
+ boolean isFineLogging = LOG.isLoggable(Level.FINE);
pausedMessage = message;
while (state == State.EXECUTING && iterator.hasNext()) {
try {
Interceptor currentInterceptor = iterator.next();
-
- if (LOG.isLoggable(Level.FINE)) {
+ if (isFineLogging) {
LOG.fine("Invoking handleMessage on interceptor " +
currentInterceptor);
}
//System.out.println("-----------" + currentInterceptor);
currentInterceptor.handleMessage(message);
-
} catch (RuntimeException ex) {
if (!faultOccurred) {
@@ -324,9 +322,10 @@
@SuppressWarnings("unchecked")
private void unwind(Message message) {
+ boolean isFineLogging = LOG.isLoggable(Level.FINE);
while (iterator.hasPrevious()) {
Interceptor currentInterceptor = iterator.previous();
- if (LOG.isLoggable(Level.FINE)) {
+ if (isFineLogging) {
LOG.fine("Invoking handleFault on interceptor " +
currentInterceptor);
}
currentInterceptor.handleFault(message);
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java?rev=685205&r1=685204&r2=685205&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
Tue Aug 12 08:52:51 2008
@@ -105,8 +105,9 @@
if (controller != null
&& !StringUtils.isEmpty(controller.getLastBaseURL())) {
String ad = d.getEndpointInfo().getAddress();
- if (ad.equals(path)
- || ad.equals(controller.getLastBaseURL() + path)) {
+ if (ad != null
+ && (ad.equals(path)
+ || ad.equals(controller.getLastBaseURL() + path))) {
d.getEndpointInfo().setAddress(controller.getLastBaseURL()
+ path);
if (d.getEndpointInfo().getExtensor(AddressType.class) !=
null) {
d.getEndpointInfo().getExtensor(AddressType.class)
Modified: cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=685205&r1=685204&r2=685205&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Tue Aug 12 08:52:51 2008
@@ -74,6 +74,14 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk13</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ </exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?rev=685205&r1=685204&r2=685205&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
Tue Aug 12 08:52:51 2008
@@ -22,6 +22,9 @@
import java.util.HashSet;
import java.util.Set;
+import javax.jws.WebService;
+import javax.xml.ws.Endpoint;
+
import org.w3c.dom.Document;
import com.meterware.httpunit.GetMethodWebRequest;
@@ -197,4 +200,19 @@
assertTrue("the xsd should contain the completType SimpleStruct",
text.contains("<complexType name=\"SimpleStruct\">"));
}
+
+
+ @Test
+ public void testGetBinding() throws Exception {
+ Endpoint ep =
Endpoint.create("http://schemas.xmlsoap.org/wsdl/soap/http";, new HelloImpl());
+ System.out.println(ep.getBinding().getClass());
+ }
+
+ @WebService(name = "Hello", portName = "HelloPort",
+ serviceName = "HelloService", targetNamespace =
"http://cxf.apache.org/hello";)
+ public static class HelloImpl {
+ public String hello(String name) {
+ return "Hello " + name;
+ }
+ }
}
