cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r702899 - in /cxf/branches/2.0.x-fixes: ./ parent/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ rt/transports/jbi/src/main/java/org/apache/cxf/transport...
Date Wed, 08 Oct 2008 14:54:37 GMT
Author: dkulp
Date: Wed Oct  8 07:54:36 2008
New Revision: 702899

URL: http://svn.apache.org/viewvc?rev=702899&view=rev
Log:
Merged revisions 702870 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r702870 | dkulp | 2008-10-08 09:37:48 -0400 (Wed, 08 Oct 2008) | 9 lines
  
  Merged revisions 702616 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r702616 | bimargulies | 2008-10-07 16:26:30 -0400 (Tue, 07 Oct 2008) | 2 lines
    
    Fixes from Peter Jones to CXF-1840 and 1845. Thank you!
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/parent/pom.xml
    cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
    cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
    cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct  8 07:54:36 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-702643,702649,702760
-/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,701862,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,702649,702760,702870
+/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,701862,702267,702580,702602,702609,702616
 /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/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=702899&r1=702898&r2=702899&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/parent/pom.xml Wed Oct  8 07:54:36 2008
@@ -241,7 +241,7 @@
                                 <value>${spring.validation.mode}</value>
                             </property>
                             <property>
-                                <!-- If we close the port after a client in the same JVM
has oppened a keep-alive
+                                <!-- If we close the port after a client in the same JVM
has opened a keep-alive
                                 connection, on some Linux's, the socket remains consumed
until
                                 some timeout occurs.   That may cause some tests to timeout/hang.
-->
                                 <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
@@ -1012,12 +1012,16 @@
                                     <value>${spring.validation.mode}</value>
                                 </property>
                                 <property>
-                                   <!-- If we close the port after a client in the same
JVM has oppened a keep-alive
-                                    connection, on some Linux's, the socket remains consumed
until
-                                    some timeout occurs.   That may cause some tests to timeout/hang.
-->
+                                    <!-- If we close the port after a client in the same
JVM has opened a keep-alive
+                                     connection, on some Linux's, the socket remains consumed
until
+                                     some timeout occurs.   That may cause some tests to
timeout/hang. -->
                                     <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
                                     <value>false</value>
                                 </property>                                 
+                                <property>
+                                    <name>java.security.properties</name>
+                                    <value>${basedir}/target/test-classes/ibm.security</value>
+                                </property>
                             </systemProperties>
                         </configuration>
                     </plugin>

Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java?rev=702899&r1=702898&r2=702899&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
Wed Oct  8 07:54:36 2008
@@ -49,6 +49,9 @@
     }
 
     public static Attachment getAttachment(String id, Collection<Attachment> attachments)
{
+        if (id == null) {
+            throw new DatabindingException("Cannot get attachment: null id");
+        }
         int i = id.indexOf("cid:");
         if (i != -1) {
             id = id.substring(4).trim();

Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java?rev=702899&r1=702898&r2=702899&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
Wed Oct  8 07:54:36 2008
@@ -247,8 +247,14 @@
     }
 
     public MessageReader getAttributeReader(QName qName) {
-        return new AttributeReader(qName, root.getAttributeValue(qName.getNamespaceURI(),
qName
-            .getLocalPart()));
+        String attribute = root.getAttributeValue(qName.getNamespaceURI(), qName.getLocalPart());
+        if (attribute == null && "".equals(qName.getNamespaceURI())) {
+            // The qName namespaceURI of the attribute seems to be null
+            // rather than "" when using the ibmjdk.
+            // The MtomTest systest fails unless we do this.
+            attribute = root.getAttributeValue(null, qName.getLocalPart());
+        }
+        return new AttributeReader(qName, attribute);
     }
 
     public MessageReader getNextAttributeReader() {

Modified: cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java?rev=702899&r1=702898&r2=702899&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
Wed Oct  8 07:54:36 2008
@@ -143,7 +143,7 @@
     public void putDestination(String epName, JBIDestination destination) throws JBIException
{
         if (destinationMap.containsKey(epName)) {
             throw new JBIException("JBIDestination for Endpoint "
-                                   + epName + " already be created");
+                                   + epName + " has already been created");
         } else {
             destinationMap.put(epName, destination);
         }



Mime
View raw message