Author: dkulp
Date: Mon Jan 12 11:44:46 2009
New Revision: 733876
URL: http://svn.apache.org/viewvc?rev=733876&view=rev
Log:
Merged revisions 732363 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r732363 | seanoc | 2009-01-07 10:30:18 -0500 (Wed, 07 Jan 2009) | 1 line
More Nodelist changes and fix chcekstyle failures in Aegis ArrayType
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 11:44:46 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,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,733582
+/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,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,733582
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java?rev=733876&r1=733875&r2=733876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
Mon Jan 12 11:44:46 2009
@@ -226,8 +226,8 @@
}
}
- public NodeList getUsageForms() {
- return getUsage().getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID,
"form");
+ public List<Element> getUsageForms() {
+ return DOMUtils.findAllElementsByTagNameNS(getUsage(),
Tool.TOOL_SPEC_PUBLIC_ID, "form");
}
/**
Modified:
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java?rev=733876&r1=733875&r2=733876&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
Mon Jan 12 11:44:46 2009
@@ -38,9 +38,9 @@
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.tools.common.toolspec.Tool;
import org.apache.cxf.tools.common.toolspec.ToolSpec;
@@ -114,14 +114,37 @@
// for all form elements...
Element usage = toolspec.getUsage();
- NodeList usageForms = toolspec.getUsageForms();
+ List<Element> usageForms = toolspec.getUsageForms();
if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Found " + usageForms.getLength()
+ LOG.fine("Found " + usageForms.size()
+ " alternative forms of usage, will use default form");
}
- if (usageForms.getLength() > 0) {
+ if (usageForms.size() > 0) {
ErrorVisitor errors = new ErrorVisitor();
+
+ for (Element elem : usageForms) {
+ Form form = new Form(elem);
+
+ int pos = tokens.getPosition();
+ if (form.accept(tokens, commandEl, errors)) {
+ commandEl.setAttribute("form", form.getName());
+ break;
+ } else {
+ // if no more left then return null;
+ tokens.setPosition(pos);
+
+ if (elem.getNextSibling() == null) {
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.info("No more forms left to try, returning
null");
+ }
+ throwUsage(errors);
+ }
+ }
+
+
+ }
+/*
for (int i = 0; i < usageForms.getLength(); i++) {
Form form = new Form((Element)usageForms.item(i));
@@ -141,6 +164,7 @@
}
}
}
+*/
} else {
ErrorVisitor errors = new ErrorVisitor();
Form form = new Form(usage);
@@ -291,9 +315,14 @@
public String getDetailedUsage(String id) {
String result = null;
Element element = toolspec.getElementById(id);
- NodeList annotations =
element.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "annotation");
- if ((annotations != null) && (annotations.getLength() > 0)) {
- result = annotations.item(0).getFirstChild().getNodeValue();
+
+ List<Element> annotations =
DOMUtils.findAllElementsByTagNameNS(element,
+
Tool.TOOL_SPEC_PUBLIC_ID,
+
"annotation");
+
+
+ if ((annotations != null) && (annotations.size() > 0)) {
+ result = annotations.get(0).getFirstChild().getNodeValue();
}
return result;
}
