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/02/19 02:30:13 UTC
svn commit: r154377 - in xmlbeans/trunk/src:
store/org/apache/xmlbeans/impl/store/Saver.java
typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java
xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java
xmlpublic/org/apache/xmlbeans/XmlOptions.java
Author: radup
Date: Fri Feb 18 17:30:11 2005
New Revision: 154377
URL: http://svn.apache.org/viewcvs?view=rev&rev=154377
Log:
Misc simple fixes.
Modified:
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
xmlbeans/trunk/src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java?view=diff&r1=154376&r2=154377
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java Fri Feb 18 17:30:11 2005
@@ -534,6 +534,13 @@
if (mappingPrefix().equals( prefix ))
return;
+ // Also make sure that the prefix declaration is not redundant
+ // This has the side-effect of making it impossible to set a
+ // redundant prefix declaration, but seems that it's better
+ // to just never issue a duplicate prefix declaration.
+ if (uri.equals(getNamespaceForPrefix(prefix)))
+ return;
+
addMapping( prefix, uri );
}
}
Modified: xmlbeans/trunk/src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java?view=diff&r1=154376&r2=154377
==============================================================================
--- xmlbeans/trunk/src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java (original)
+++ xmlbeans/trunk/src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java Fri Feb 18 17:30:11 2005
@@ -50,6 +50,16 @@
{
try
{
+ // The fact that we are using TypeSystemHolder.class.getClassLoader()
+ // to load the SchemaTypeSystem class means that the TypeSystemHolder's
+ // classloader MUST be a descendant of the XmlBeans classloader, even
+ // though it can be different.
+ // In other words, each Schema type has only one copy per VM, not one
+ // copy per copy of XmlBeans in use, therefore this implies that
+ // there either must be one copy of XmlBeans in the VM or copies in
+ // different classloaders will each need a different copy of one
+ // Schema type, which seems a reasonable restriction, but needs to be
+ // understood nevertheless
return (SchemaTypeSystem)
Class.forName(
"org.apache.xmlbeans.impl.schema.SchemaTypeSystemImpl",
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java?view=diff&r1=154376&r2=154377
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java Fri Feb 18 17:30:11 2005
@@ -163,6 +163,9 @@
for (Iterator i = compErrors.iterator(); i.hasNext(); )
System.out.println(i.next());
}
+
+ if (sLoader == null)
+ sLoader = XmlBeans.getContextTypeLoader();
for (int i = 0; i < instanceFiles.length; i++)
{
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java?view=diff&r1=154376&r2=154377
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java Fri Feb 18 17:30:11 2005
@@ -632,8 +632,8 @@
*
* @param source A Java version number
*
- * @see GENERATE_JAVA_14
- * @see GENERATE_JAVA_15
+ * @see #GENERATE_JAVA_14
+ * @see #GENERATE_JAVA_15
* @see XmlBeans#compileXmlBeans
*/
public XmlOptions setGenerateJavaVersion (String source) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org