:) :) :) :) :)
--- James M Snell <[EMAIL PROTECTED]> wrote:
> Nobody panic or anything, but I'm not 100% done with the checkins on this
> so some tests will still fail with this update.
>
> - James Snell
> IBM Emerging Technologies
> [EMAIL PROTECTED]
> (559) 587-1233 (office)
> (700) 544-9035 (t/l)
> Programming Web Services With SOAP
> O'Reilly & Associates, ISBN 0596000952
>
> Have I not commanded you? Be strong and courageous.
> Do not be terrified, do not be discouraged, for the Lord your
> God will be with you whereever you go. - Joshua 1:9
>
>
>
> [EMAIL PROTECTED]
> 02/28/2003 12:28 PM
> Please respond to axis-dev
>
>
> To
> [EMAIL PROTECTED]
> cc
>
> bcc
>
> Subject
> cvs commit: xml-axis/java/src/org/apache/axis/utils JavaUtils.java
>
>
>
> jmsnell 2003/02/28 12:28:58
>
> Modified: java/test/utils TestJavaUtils.java
> java/src/org/apache/axis/utils JavaUtils.java
> Log:
> Adjusting the JAX-RPC mapping support so it's more correct.
> There are still some potential problems that will need to be explored post
> 1.1
>
> Revision Changes Path
> 1.17 +23 -2 xml-axis/java/test/utils/TestJavaUtils.java
>
> Index: TestJavaUtils.java
> ===================================================================
> RCS file: /home/cvs/xml-axis/java/test/utils/TestJavaUtils.java,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -r1.16 -r1.17
> --- TestJavaUtils.java 11 Dec 2002 22:40:19 -0000 1.16
> +++ TestJavaUtils.java 28 Feb 2003 20:28:57 -0000 1.17
> @@ -33,34 +33,55 @@
> * See JSR-101: JAX-RPC, Appendix: Mapping of XML Names
> */
> public void testXmlNameToJava() {
> +
> assertEquals("mixedCaseName", JavaUtils.xmlNameToJava("mixedCaseName"));
> +
> assertEquals("nameWithDashes",
> JavaUtils.xmlNameToJava("name-with-dashes"));
> +
> assertEquals("otherPunctChars",
> JavaUtils.xmlNameToJava("other.punct\u00B7chars"));
> +
> assertEquals("answer42", JavaUtils.xmlNameToJava("Answer42"));
>
> assertEquals("\u2160Foo", JavaUtils.xmlNameToJava("\u2160foo"));
> +
> assertEquals("foo", JavaUtils.xmlNameToJava("2foo"));
> - assertEquals("_Foo_", JavaUtils.xmlNameToJava("_foo_"));
> +
> + //assertEquals("_Foo_", JavaUtils.xmlNameToJava("_foo_"));
> + assertEquals("_foo_", JavaUtils.xmlNameToJava("_foo_"));
> +
> assertEquals("foobar", JavaUtils.xmlNameToJava("--foobar--"));
>
> assertEquals("foo22Bar", JavaUtils.xmlNameToJava("foo22bar"));
> +
> assertEquals("foo\u2160Bar", JavaUtils.xmlNameToJava("foo\u2160bar"));
>
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo-bar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo.bar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo:bar"));
> - assertEquals("foo_Bar", JavaUtils.xmlNameToJava("foo_bar"));
> +
> + //assertEquals("foo_Bar", JavaUtils.xmlNameToJava("foo_bar"));
> + assertEquals("foo_bar", JavaUtils.xmlNameToJava("foo_bar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo\u00B7bar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo\u0387bar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo\u06DDbar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("foo\u06DEbar"));
> +
> assertEquals("fooBar", JavaUtils.xmlNameToJava("FooBar"));
> +
> assertEquals("FOOBar", JavaUtils.xmlNameToJava("FOOBar"));
>
> assertEquals("a1BBB", JavaUtils.xmlNameToJava("A1-BBB"));
> +
> assertEquals("ABBB", JavaUtils.xmlNameToJava("A-BBB"));
> +
> assertEquals("ACCC", JavaUtils.xmlNameToJava("ACCC"));
>
>
>
>
>
> 1.96 +4 -2 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
>
> Index: JavaUtils.java
> ===================================================================
> RCS file:
> /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
> retrieving revision 1.95
> retrieving revision 1.96
> diff -u -r1.95 -r1.96
> --- JavaUtils.java 28 Feb 2003 17:25:49 -0000 1.95
> +++ JavaUtils.java 28 Feb 2003 20:28:58 -0000 1.96
> @@ -780,7 +780,8 @@
> // Introspector function now after we filter out all bad chars.
>
> result.append(nameArray[i]);
> - wordStart = !Character.isLetter(nameArray[i]);
> + //wordStart = !Character.isLetter(nameArray[i]);
> + wordStart = !Character.isLetter(nameArray[i]) && nameArray[i]
> != "_".charAt(0);
> }
> else {
> // The identifier cannot be mapped strictly according to
> @@ -819,7 +820,8 @@
> // If c is not a character, but is a legal Java
> // identifier character, capitalize the next character.
> // For example: "22hi" becomes "22Hi"
> - wordStart = !Character.isLetter(c);
> + //wordStart = !Character.isLetter(c);
> + wordStart = !Character.isLetter(c) && c != "_".charAt(0);
> }
>
> // covert back to a String
>
>
>
>
=====
Davanum Srinivas - http://webservices.apache.org/~dims/
__________________________________________________
Do you Yahoo!?
Yahoo! Tax Center - forms, calculators, tips, more
http://taxes.yahoo.com/
