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 2009/03/06 17:16:59 UTC
svn commit: r750957 - in /cxf/branches/2.1.x-fixes: ./
common/common/src/main/java/org/apache/cxf/staxutils/
tools/common/src/main/java/org/apache/cxf/tools/common/
tools/common/src/main/java/org/apache/cxf/tools/util/
tools/common/src/test/java/org/ap...
Author: dkulp
Date: Fri Mar 6 16:16:58 2009
New Revision: 750957
URL: http://svn.apache.org/viewvc?rev=750957&view=rev
Log:
Merged revisions 749505 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r749505 | bimargulies | 2009-03-02 20:56:03 -0500 (Mon, 02 Mar 2009) | 2 lines
Knock off small problems with sjsxp. Also rename a really confusingly named class.
........
Added:
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
- copied unchanged from r749505, cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
cxf/branches/2.1.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java
cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 6 16:16:58 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
8223,748305,748313,748603-748604,748768,749420,749449,749454-749456
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=750957&r1=750956&r2=750957&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Fri Mar 6 16:16:58 2009
@@ -64,6 +64,7 @@
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
@@ -94,6 +95,15 @@
private StaxUtils() {
}
+
+ public static boolean isWoodstox() {
+ try {
+ ClassLoaderUtils.loadClass("org.codehaus.stax2.XMLStreamReader2", StaxUtils.class);
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
+ return true;
+ }
/**
* Return a cached, namespace-aware, factory.
Modified: cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=750957&r1=750956&r2=750957&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java Fri Mar 6 16:16:58 2009
@@ -42,7 +42,7 @@
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.tools.util.StAXUtil;
+import org.apache.cxf.tools.util.ToolsStaxUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -195,8 +195,8 @@
public boolean assertXmlEquals(final File expected, final File source,
final List<String> ignoreAttr) throws Exception {
- List<Tag> expectedTags = StAXUtil.getTags(expected);
- List<Tag> sourceTags = StAXUtil.getTags(source);
+ List<Tag> expectedTags = ToolsStaxUtils.getTags(expected);
+ List<Tag> sourceTags = ToolsStaxUtils.getTags(source);
Iterator<Tag> iterator = sourceTags.iterator();
@@ -304,8 +304,8 @@
public void assertWsdlEquals(final File expected, final File source, List<String> attr, List<String> tag)
throws Exception {
- Tag expectedTag = StAXUtil.getTagTree(expected, attr);
- Tag sourceTag = StAXUtil.getTagTree(source, attr);
+ Tag expectedTag = ToolsStaxUtils.getTagTree(expected, attr);
+ Tag sourceTag = ToolsStaxUtils.getTagTree(source, attr);
assertTagEquals(expectedTag, sourceTag, attr, tag);
}
@@ -316,8 +316,8 @@
public void assertWsdlEquals(final InputStream expected, final InputStream source,
List<String> attr, List<String> tag)
throws Exception {
- Tag expectedTag = StAXUtil.getTagTree(expected, attr);
- Tag sourceTag = StAXUtil.getTagTree(source, attr);
+ Tag expectedTag = ToolsStaxUtils.getTagTree(expected, attr);
+ Tag sourceTag = ToolsStaxUtils.getTagTree(source, attr);
assertTagEquals(expectedTag, sourceTag, attr, tag);
}
Modified: cxf/branches/2.1.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java?rev=750957&r1=750956&r2=750957&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java (original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java Fri Mar 6 16:16:58 2009
@@ -32,7 +32,7 @@
File file = new File(getClass().getResource("resources/test.wsdl").toURI());
file = getResource("resources/test2.wsdl");
- Tag tag1 = StAXUtil.getTagTree(file);
+ Tag tag1 = ToolsStaxUtils.getTagTree(file);
assertEquals(1, tag1.getTags().size());
Tag def1 = tag1.getTags().get(0);
assertEquals(6, def1.getTags().size());
@@ -41,7 +41,7 @@
assertEquals(4, schema1.getTags().size());
file = getResource("resources/test3.wsdl");
- Tag tag2 = StAXUtil.getTagTree(file);
+ Tag tag2 = ToolsStaxUtils.getTagTree(file);
assertEquals(1, tag2.getTags().size());
Tag def2 = tag2.getTags().get(0);
assertEquals(6, def2.getTags().size());
Modified: cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=750957&r1=750956&r2=750957&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original)
+++ cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Fri Mar 6 16:16:58 2009
@@ -22,6 +22,7 @@
import java.net.URL;
import java.util.Enumeration;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ToolTestBase;
import org.junit.Before;
import org.junit.Test;
@@ -83,8 +84,12 @@
String[] args = new String[] {"-verbose",
getLocation("/validator_wsdl/hello_world_error_reference.wsdl")};
WSDLValidator.main(args);
- assertTrue(getStdErr().indexOf("[147,3]") != -1);
- assertTrue(getStdErr().indexOf("Caused by {http://apache.org/hello_world_soap_http}"
+ String error = getStdErr();
+ if (StaxUtils.isWoodstox()) {
+ // sjsxp doesn't report locations.
+ assertTrue(error.indexOf("[147,3]") != -1);
+ }
+ assertTrue(error.indexOf("Caused by {http://apache.org/hello_world_soap_http}"
+ "[binding:Greeter_SOAPBinding1] not exist.") != -1);
}
Modified: cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java?rev=750957&r1=750956&r2=750957&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java (original)
+++ cxf/branches/2.1.x-fixes/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java Fri Mar 6 16:16:58 2009
@@ -26,6 +26,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.validator.internal.model.XNode;
import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
import org.junit.Assert;
@@ -57,12 +58,23 @@
assertEquals(2, results.getErrors().size());
String t = results.getErrors().pop();
String text = "{http://apache.org/hello_world/messages}[portType:GreeterA][operation:sayHi]";
- Message msg = new Message("FAILED_AT_POINT",
- WSDLRefValidator.LOG,
- 27,
- 2,
- new java.net.URI(wsdl).toURL(),
- text);
+ Message msg;
+ if (StaxUtils.isWoodstox()) {
+ msg = new Message("FAILED_AT_POINT",
+ WSDLRefValidator.LOG,
+ 27,
+ 2,
+ new java.net.URI(wsdl).toURL(),
+ text);
+ } else {
+ // sjsxp
+ msg = new Message("FAILED_AT_POINT",
+ WSDLRefValidator.LOG,
+ -1,
+ -1,
+ new java.net.URI(wsdl).toURL(),
+ text);
+ }
assertEquals(msg.toString(), t);
}
@@ -127,12 +139,22 @@
assertEquals(1, results.getErrors().size());
String text = "{http://schemas.apache.org/yoko/idl/OptionsPT}[message:getEmployee]";
- Message msg = new Message("FAILED_AT_POINT",
- WSDLRefValidator.LOG,
- 42,
- 6,
- new java.net.URI(wsdl).toURL(),
- text);
+ Message msg;
+ if (StaxUtils.isWoodstox()) {
+ msg = new Message("FAILED_AT_POINT",
+ WSDLRefValidator.LOG,
+ 42,
+ 6,
+ new java.net.URI(wsdl).toURL(),
+ text);
+ } else {
+ msg = new Message("FAILED_AT_POINT",
+ WSDLRefValidator.LOG,
+ -1,
+ -1,
+ new java.net.URI(wsdl).toURL(),
+ text);
+ }
assertEquals(msg.toString(), results.getErrors().pop());
}
Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=750957&r1=750956&r2=750957&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Fri Mar 6 16:16:58 2009
@@ -56,7 +56,6 @@
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.util.StAXUtil;
import org.apache.cxf.tools.util.URIParserUtil;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
import org.apache.xml.resolver.Catalog;
@@ -459,7 +458,7 @@
throw new ToolException(msg, e1);
}
XMLStreamReader reader = StaxUtils.createXMLStreamReader(root);
- StAXUtil.toStartTag(reader);
+ StaxUtils.toNextTag(reader);
if (isValidJaxwsBindingFile(bindingFile, reader)) {
String wsdlLocation = root.getAttribute("wsdlLocation");