cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r685265 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/phase/ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ rt/ws/security/ systests/src/test/java/org/apache/cxf/systest/servlet/
Date Tue, 12 Aug 2008 18:58:41 GMT
Author: dkulp
Date: Tue Aug 12 11:58:40 2008
New Revision: 685265

URL: http://svn.apache.org/viewvc?rev=685265&view=rev
Log:
Merged revisions 685205 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r685205 | dkulp | 2008-08-12 11:52:51 -0400 (Tue, 12 Aug 2008) | 4 lines
  
  [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/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
    cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 12 11:58:40 2008
@@ -1 +1 @@
-/cxf/trunk: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
+/cxf/trunk: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

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 12 11:58:40 2008
@@ -1 +1 @@
-/cxf/trunk:1-684881,684883-684884,684886-684888,684890-684892,684894-684923
+/cxf/trunk:1-684881,684883-684884,684886-684888,684890-684892,684894-684923,685205

Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=685265&r1=685264&r2=685265&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Tue Aug 12 11:58:40 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/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java?rev=685265&r1=685264&r2=685265&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
Tue Aug 12 11:58:40 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/branches/2.0.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml?rev=685265&r1=685264&r2=685265&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml Tue Aug 12 11:58:40 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/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?rev=685265&r1=685264&r2=685265&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
Tue Aug 12 11:58:40 2008
@@ -19,6 +19,9 @@
 package org.apache.cxf.systest.servlet;
 
 
+import javax.jws.WebService;
+import javax.xml.ws.Endpoint;
+
 import org.w3c.dom.Document;
 
 import com.meterware.httpunit.GetMethodWebRequest;
@@ -181,4 +184,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;
+        }
+    }
 }



Mime
View raw message