cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r719342 - in /cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
Date Thu, 20 Nov 2008 19:47:29 GMT
Author: dkulp
Date: Thu Nov 20 11:47:28 2008
New Revision: 719342

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

................
  r719308 | dkulp | 2008-11-20 12:55:37 -0500 (Thu, 20 Nov 2008) | 9 lines
  
  Merged revisions 719273 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r719273 | dkulp | 2008-11-20 11:31:34 -0500 (Thu, 20 Nov 2008) | 2 lines
    
    Work around issue with Sun stax implementation not liking null namespaces
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
  (props changed)

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 11:47:28 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,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303
-/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,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222
+/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,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308
+/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,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273
 /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/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java?rev=719342&r1=719341&r2=719342&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
(original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
Thu Nov 20 11:47:28 2008
@@ -112,13 +112,13 @@
 
     public void writeAttribute(java.lang.String localName, java.lang.String value)
         throws XMLStreamException {
-        writeAttribute(null, localName, value);
+        baseWriter.writeAttribute(localName, value);
     }
 
     public void writeAttribute(java.lang.String namespaceURI,
                         java.lang.String localName,
                         java.lang.String value) throws XMLStreamException {
-        writeAttribute(null, namespaceURI, localName, value);
+        baseWriter.writeAttribute(namespaceURI, localName, value);
     }
 
     public void writeAttribute(java.lang.String prefix,
@@ -158,7 +158,7 @@
 
     public void writeEmptyElement(java.lang.String namespaceURI, java.lang.String localName)
         throws XMLStreamException {
-        writeEmptyElement(null, namespaceURI, localName);
+        baseWriter.writeEmptyElement(localName, namespaceURI);
     }
 
     public void writeEmptyElement(java.lang.String prefix,
@@ -238,7 +238,13 @@
             CurrentElement elem = (CurrentElement) elems.peek();
             elem.setChildElements(true);
         }
-        baseWriter.writeStartElement(prefix, localName, namespaceURI);
+        if (prefix == null && namespaceURI == null) {
+            baseWriter.writeStartElement(localName);
+        } else if (prefix == null) {
+            baseWriter.writeStartElement(namespaceURI, localName);            
+        } else {
+            baseWriter.writeStartElement(prefix, localName, namespaceURI);
+        }
         elems.push(new CurrentElement(currElemName));
     }
 

Propchange: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 11:47:28 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,719296,719300-719301,719303
+/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,719296,719300-719301,719303,719308



Mime
View raw message