You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ra...@apache.org on 2005/05/08 01:03:08 UTC
svn commit: r169117 - in /xmlbeans/trunk: ./ external/lib/
src/common/org/apache/xmlbeans/impl/common/
src/typeimpl/org/apache/xmlbeans/impl/schema/
src/xmlpublic/org/apache/xmlbeans/
Author: radup
Date: Sat May 7 16:03:08 2005
New Revision: 169117
URL: http://svn.apache.org/viewcvs?rev=169117&view=rev
Log:
Upgraded piccolo to the 1.04 version + our fixes + a new fix enabling non-ASCII characters in element and attribute names.
Several other minor bugfixes.
Added:
xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711.jar (with props)
xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711_v2.jar (with props)
Modified:
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/build.xml?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Sat May 7 16:03:08 2005
@@ -1057,7 +1057,7 @@
<target name="piccolo.classes" depends="piccolo.classes.check, dirs, repackage.classes" unless="piccolo.classes.notRequired">
<delete dir="build/private/piccolo"/>
<mkdir dir="build/private/piccolo"/>
- <unjar src="external/lib/piccolo_apache_dist_20040629_v2.jar" dest="build/private/piccolo"/>
+ <unjar src="external/lib/piccolo_apache_dist_20040711_v2.jar" dest="build/private/piccolo"/>
<echo message="Re-packaging Piccolo"/>
Added: xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711.jar
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711.jar?rev=169117&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711_v2.jar
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711_v2.jar?rev=169117&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlbeans/trunk/external/lib/piccolo_apache_dist_20040711_v2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java (original)
+++ xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java Sat May 7 16:03:08 2005
@@ -519,6 +519,8 @@
}
if (buf.length() == 0)
return "noNamespace";
+ if (useJaxRpcRules)
+ return buf.substring(0, buf.length() - 1).toLowerCase();
return buf.substring(0, buf.length() - 1); // chop off extra dot
}
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java Sat May 7 16:03:08 2005
@@ -2226,12 +2226,12 @@
return "noouter";
else if (getOuterType().getBaseType() == this)
prefix = "B=";
+ else if (getOuterType().getContentBasedOnType() == this)
+ prefix = "S=";
else if (getOuterType().getSimpleVariety() == SchemaType.LIST)
prefix = "I=";
else if (getOuterType().getSimpleVariety() == SchemaType.UNION)
prefix = "M=" + getAnonymousUnionMemberOrdinal();
- else if (getOuterType().getContentBasedOnType() == this)
- prefix = "S=";
else
prefix = "strange=";
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java Sat May 7 16:03:08 2005
@@ -276,17 +276,20 @@
// Sun's implementation of URI doesn't support references to the
// parent directory ("/..") in the part after "!/" so we have to
// remove these ourselves
- int slashDotDotIndex = r.lastIndexOf("/..");
int exclPointSlashIndex = r.lastIndexOf("!/");
- while (slashDotDotIndex >= 0 && slashDotDotIndex > exclPointSlashIndex)
+ if (exclPointSlashIndex > 0)
{
- int prevSlashIndex = r.lastIndexOf("/", slashDotDotIndex - 1);
- if (prevSlashIndex >= exclPointSlashIndex)
+ int slashDotDotIndex = r.indexOf("/..", exclPointSlashIndex);
+ while (slashDotDotIndex > 0)
{
- String temp = r.substring(slashDotDotIndex + 3);
- r = r.substring(0, prevSlashIndex).concat(temp);
+ int prevSlashIndex = r.lastIndexOf("/", slashDotDotIndex - 1);
+ if (prevSlashIndex >= exclPointSlashIndex)
+ {
+ String temp = r.substring(slashDotDotIndex + 3);
+ r = r.substring(0, prevSlashIndex).concat(temp);
+ }
+ slashDotDotIndex = r.indexOf("/..", exclPointSlashIndex);
}
- slashDotDotIndex = r.lastIndexOf("/..");
}
return URI.create(r);
}
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java Sat May 7 16:03:08 2005
@@ -1653,7 +1653,14 @@
c.dispose();
if (arrayType != null)
{
- wat = new SOAPArrayType(arrayType, new NamespaceContext(xsdAttr));
+ try
+ {
+ wat = new SOAPArrayType(arrayType, new NamespaceContext(xsdAttr));
+ }
+ catch (XmlValueOutOfRangeException)
+ {
+ state.error(XmlErrorCodes.QNAME, null, xsdAttr);
+ }
}
SchemaAnnotationImpl ann = SchemaAnnotationImpl.getAnnotation(state.getContainer(targetNamespace), xsdAttr);
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java Sat May 7 16:03:08 2005
@@ -201,7 +201,8 @@
* Constructs a GDuration with the specified sign,
* year, month, day, hours, minutes, seconds, and optional
* fractional seconds.
- * @parameter sign +1 for a positive duration, -1 for a negative duration
+ * @param sign +1 for a positive duration, -1 for a negative duration
+ * @throws java.lang.IllegalArgumentException if the sign is not 1 or -1
*/
public GDuration(
int sign,
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java?rev=169117&r1=169116&r2=169117&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java Sat May 7 16:03:08 2005
@@ -55,6 +55,8 @@
* Constructs a GDurationBuilder with the specified sign,
* year, month, day, hours, minutes, seconds, and optional
* fractional seconds.
+ * @param sign +1 for a positive duration, -1 for a negative duration
+ * @throws java.lang.IllegalArgumentException if the sign is not 1 or -1
*/
public GDurationBuilder(
int sign,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org