You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2004/02/12 08:20:43 UTC
cvs commit: xml-xmlbeans/v1/xkit/schemas/easypo easypo.xsdconfig
cezar 2004/02/11 23:20:43
Modified: v1/external/lib oldxbean.jar
v1/src/configschema/schema xmlconfig.xsd
v1/src/jaxb/schema jaxbconfig.xsdconfig
v1/src/typeimpl/org/apache/xmlbeans/impl/schema
SchemaTypeSystemCompiler.java
SchemaTypeSystemImpl.java
v1/src/xmlcomp/org/apache/xmlbeans/impl/tool
SchemaCompiler.java
v1/src/xmlconfig/org/apache/xmlbeans/impl/config
SchemaConfig.java
v1/test/cases/schema/annuity annuitynet.xsdconfig
v1/test/src/drt/drtcases JaxenXPathTests.java
v1/test/src/easypo easypo.xsdconfig
v1/test/src/erictest EricTest.java
v1/xkit/schemas/easypo easypo.xsdconfig
Log:
Changing the target namespace of .xsdconfig files in v1 tree. Old .xsdconfig files are still working for compatibility reasons.
CR: Eric
DRT: passes
Revision Changes Path
1.5 +4449 -4398xml-xmlbeans/v1/external/lib/oldxbean.jar
<<Binary file>>
1.2 +2 -2 xml-xmlbeans/v1/src/configschema/schema/xmlconfig.xsd
Index: xmlconfig.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/configschema/schema/xmlconfig.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlconfig.xsd 15 Sep 2003 18:20:27 -0000 1.1
+++ xmlconfig.xsd 12 Feb 2004 07:20:42 -0000 1.2
@@ -1,7 +1,7 @@
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xb="http://www.bea.com/2002/09/xbean/config"
- targetNamespace="http://www.bea.com/2002/09/xbean/config"
+ xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config"
+ targetNamespace="http://xml.apache.org/xmlbeans/2004/02/xbean/config"
elementFormDefault="qualified">
<xs:import namespace="http://www.w3.org/2001/XMLSchema"/>
1.2 +1 -1 xml-xmlbeans/v1/src/jaxb/schema/jaxbconfig.xsdconfig
Index: jaxbconfig.xsdconfig
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/jaxb/schema/jaxbconfig.xsdconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jaxbconfig.xsdconfig 15 Sep 2003 18:20:28 -0000 1.1
+++ jaxbconfig.xsdconfig 12 Feb 2004 07:20:42 -0000 1.2
@@ -1,4 +1,4 @@
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
<xb:namespace uri="http://www.bea.com/2003/08/jaxb/config">
<xb:package>org.apache.xmlbeans.impl.jaxb.config</xb:package>
</xb:namespace>
1.3 +2 -2 xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
Index: SchemaTypeSystemCompiler.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SchemaTypeSystemCompiler.java 24 Sep 2003 23:31:07 -0000 1.2
+++ SchemaTypeSystemCompiler.java 12 Feb 2004 07:20:42 -0000 1.3
@@ -68,8 +68,8 @@
import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
import org.w3.x2001.xmlSchema.SchemaDocument;
-import com.bea.x2002.x09.xbean.config.ConfigDocument.Config;
-import com.bea.x2002.x09.xbean.config.ConfigDocument;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument.Config;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument;
import org.apache.xmlbeans.impl.common.XmlErrorWatcher;
import org.apache.xmlbeans.impl.config.SchemaConfig;
1.4 +2 -2 xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Index: SchemaTypeSystemImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SchemaTypeSystemImpl.java 24 Sep 2003 23:31:07 -0000 1.3
+++ SchemaTypeSystemImpl.java 12 Feb 2004 07:20:42 -0000 1.4
@@ -104,8 +104,8 @@
import org.apache.xmlbeans.SchemaField;
import org.apache.xmlbeans.soap.SOAPArrayType;
import org.apache.xmlbeans.soap.SchemaWSDLArrayType;
-import com.bea.x2002.x09.xbean.config.ConfigDocument.Config;
-import com.bea.x2002.x09.xbean.config.ConfigDocument;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument.Config;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument;
import org.w3.x2001.xmlSchema.SchemaDocument;
import org.w3.x2001.xmlSchema.GroupDocument;
import org.w3.x2001.xmlSchema.AttributeGroupDocument;
1.5 +11 -2 xml-xmlbeans/v1/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
Index: SchemaCompiler.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SchemaCompiler.java 10 Jan 2004 02:29:04 -0000 1.4
+++ SchemaCompiler.java 12 Feb 2004 07:20:42 -0000 1.5
@@ -72,7 +72,7 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.SimpleValue;
-import com.bea.x2002.x09.xbean.config.ConfigDocument;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument;
import java.io.File;
import java.util.*;
@@ -630,6 +630,7 @@
XmlOptions options = new XmlOptions();
options.setLoadLineNumbers();
options.setLoadMessageDigest();
+ options.setLoadSubstituteNamespaces(MAP_COMPATIBILITY_CONFIG_URIS);
XmlObject schemadoc = loader.parse(xsdFiles[i], null, options);
if (!(schemadoc instanceof SchemaDocument))
@@ -717,6 +718,7 @@
{
XmlOptions options = new XmlOptions();
options.put( XmlOptions.LOAD_LINE_NUMBERS );
+ options.setLoadSubstituteNamespaces(MAP_COMPATIBILITY_CONFIG_URIS);
XmlObject configdoc = loader.parse(configFiles[i], null, options);
if (!(configdoc instanceof ConfigDocument))
@@ -951,5 +953,12 @@
return false;
}
-
+ private static final String CONFIG_URI = "http://xml.apache.org/xmlbeans/2004/02/xbean/config";
+ private static final String COMPATIBILITY_CONFIG_URI = "http://www.bea.com/2002/09/xbean/config";
+ private static final Map MAP_COMPATIBILITY_CONFIG_URIS;
+ static
+ {
+ MAP_COMPATIBILITY_CONFIG_URIS = new HashMap();
+ MAP_COMPATIBILITY_CONFIG_URIS.put(COMPATIBILITY_CONFIG_URI, CONFIG_URI);
+ }
}
1.3 +3 -3 xml-xmlbeans/v1/src/xmlconfig/org/apache/xmlbeans/impl/config/SchemaConfig.java
Index: SchemaConfig.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/xmlconfig/org/apache/xmlbeans/impl/config/SchemaConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SchemaConfig.java 24 Sep 2003 23:31:12 -0000 1.2
+++ SchemaConfig.java 12 Feb 2004 07:20:42 -0000 1.3
@@ -65,9 +65,9 @@
import java.util.List;
import java.util.Iterator;
-import com.bea.x2002.x09.xbean.config.ConfigDocument.Config;
-import com.bea.x2002.x09.xbean.config.Nsconfig;
-import com.bea.x2002.x09.xbean.config.Qnameconfig;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument.Config;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Nsconfig;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Qnameconfig;
public class SchemaConfig
{
1.2 +1 -1 xml-xmlbeans/v1/test/cases/schema/annuity/annuitynet.xsdconfig
Index: annuitynet.xsdconfig
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/cases/schema/annuity/annuitynet.xsdconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- annuitynet.xsdconfig 15 Sep 2003 18:20:40 -0000 1.1
+++ annuitynet.xsdconfig 12 Feb 2004 07:20:43 -0000 1.2
@@ -1,4 +1,4 @@
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config"
xmlns:an="http://www.annuitynet.com/namespace/profiles">
<xb:namespace uri="http://www.annuitynet.com/namespace/profiles">
1.2 +13 -8 xml-xmlbeans/v1/test/src/drt/drtcases/JaxenXPathTests.java
Index: JaxenXPathTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/src/drt/drtcases/JaxenXPathTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JaxenXPathTests.java 11 Feb 2004 06:19:40 -0000 1.1
+++ JaxenXPathTests.java 12 Feb 2004 07:20:43 -0000 1.2
@@ -63,13 +63,6 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
-//import org.apache.xmlbeans.impl.xpath.jaxen.XBeansXPath;
-//import org.jaxen.XPathSyntaxException;
-//import org.jaxen.JaxenException;
-//import org.jaxen.XPath;
-//
-//import java.util.List;
-//import java.util.Iterator;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
@@ -81,7 +74,19 @@
public class JaxenXPathTests extends TestCase
{
public JaxenXPathTests(String name) { super(name); }
- public static Test suite() { return new TestSuite(JaxenXPathTests.class); }
+ public static Test suite()
+ {
+ try
+ {
+ Class.forName("org.jaxen.XPath");
+ return new TestSuite(JaxenXPathTests.class);
+ }
+ catch (ClassNotFoundException e)
+ {
+ System.out.println("\n\nWARNING!!!\n\nJaxen.jar not on classpath skipping this test.\n\n");
+ return new TestSuite();
+ }
+ }
public void testConformance() throws Exception
{
1.2 +1 -1 xml-xmlbeans/v1/test/src/easypo/easypo.xsdconfig
Index: easypo.xsdconfig
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/src/easypo/easypo.xsdconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- easypo.xsdconfig 15 Sep 2003 18:20:45 -0000 1.1
+++ easypo.xsdconfig 12 Feb 2004 07:20:43 -0000 1.2
@@ -1,4 +1,4 @@
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config"
xmlns:ep="http://openuri.org/easypo">
<xb:namespace uri="http://openuri.org/easypo">
1.6 +1 -1 xml-xmlbeans/v1/test/src/erictest/EricTest.java
Index: EricTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/src/erictest/EricTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EricTest.java 12 Feb 2004 00:18:50 -0000 1.5
+++ EricTest.java 12 Feb 2004 07:20:43 -0000 1.6
@@ -116,7 +116,7 @@
import org.apache.xmlbeans.xml.stream.XMLEvent;
import org.apache.xmlbeans.xml.stream.XMLInputStream;
import org.apache.xmlbeans.xml.stream.XMLName;
-import com.bea.x2002.x09.xbean.config.ConfigDocument;
+import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument;
public class EricTest
{
1.2 +1 -1 xml-xmlbeans/v1/xkit/schemas/easypo/easypo.xsdconfig
Index: easypo.xsdconfig
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/xkit/schemas/easypo/easypo.xsdconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- easypo.xsdconfig 15 Sep 2003 18:20:48 -0000 1.1
+++ easypo.xsdconfig 12 Feb 2004 07:20:43 -0000 1.2
@@ -1,4 +1,4 @@
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config"
xmlns:ep="http://openuri.org/easypo">
<xb:namespace uri="http://openuri.org/easypo">
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org