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 2005/01/22 09:40:29 UTC
svn commit: r126023 - in xmlbeans/trunk: . external/lib src/configschema/schema src/tools/org/apache/xmlbeans/impl/inst2xsd src/tools/org/apache/xmlbeans/impl/inst2xsd/util src/toolschema src/typeimpl/org/apache/xmlbeans/impl/schema src/xmlcomp/org/apache/xmlbeans/impl/tool src/xmlconfig/org/apache/xmlbeans/impl/config src/xmlpublic/org/apache/xmlbeans src/xmlschema/schema src/xsdschema/schema test/src/compile/scomp/checkin test/src/compile/scomp/common test/src/compile/scomp/incr/schemaCompile/detailed test/src/drt/drtcases test/src/misc/checkin test/src/tools/inst2xsd/checkin test/src/tools/inst2xsd/common test/src/tools/inst2xsd/detailed test/src/xmlcursor/checkin test/src/xmlobject/checkin test/src/xmlobject/schematypes/checkin test/tools/lib/xsl
Author: cezar
Date: Sat Jan 22 00:40:28 2005
New Revision: 126023
URL: http://svn.apache.org/viewcvs?view=rev&rev=126023
Log:
Part two for schema metadata partitioning. checkintest: passes
Added:
xmlbeans/trunk/src/configschema/schema/xmlconfig.xsdconfig
xmlbeans/trunk/src/toolschema/ltgfmt.xsdconfig
xmlbeans/trunk/src/toolschema/substwsdl.xsdconfig
xmlbeans/trunk/src/toolschema/xsdownload.xsdconfig
xmlbeans/trunk/src/xmlschema/schema/XML.xsdconfig
xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsdconfig
Removed:
xmlbeans/trunk/test/tools/lib/xsl/TestReport.xsd.jar
Modified:
xmlbeans/trunk/build.xml
xmlbeans/trunk/external/lib/oldxbean.jar
xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java
xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java
xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java
xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java
xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java
xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java
xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java
xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java
xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java
xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java
xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java
xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java
xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java
xmlbeans/trunk/testbuild.xml
Modified: xmlbeans/trunk/build.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/build.xml?view=diff&rev=126023&p1=xmlbeans/trunk/build.xml&r1=126022&p2=xmlbeans/trunk/build.xml&r2=126023
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Sat Jan 22 00:40:28 2005
@@ -626,7 +626,7 @@
<target name="xsdschema.check">
<condition property="xsdschema.notRequired">
<uptodate property="xsdschema.notRequired" targetfile="build/classes/xsdschema/schema/system/sXMLSCHEMA/index.xsb">
- <srcfiles dir="src/xsdschema" includes="**/*.xsd"/>
+ <srcfiles dir="src/xsdschema" includes="**/*.xsd*"/>
</uptodate>
</condition>
</target>
@@ -648,7 +648,7 @@
<target name="xmlschema.check">
<condition property="xmlschema.notRequired">
<uptodate property="xmlschema.notRequired" targetfile="build/classes/xmlschema/schema/system/sXMLLANG/index.xsb">
- <srcfiles dir="src/xmlschema" includes="**/*.xsd"/>
+ <srcfiles dir="src/xmlschema" includes="**/*.xsd*"/>
</uptodate>
</condition>
</target>
@@ -776,6 +776,7 @@
<arg line="${new_repackage_arg} -f ${rp_source_dir} -t ${rp_target_dir}"/>
</java>
+ <echo message="Build XmlBeans in ${rp_target_dir}"/>
<ant dir="${rp_target_dir}" target="xbean" inheritAll="false">
<property name="repackage_arg" value="${new_repackage_arg}"/>
Modified: xmlbeans/trunk/external/lib/oldxbean.jar
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/oldxbean.jar?view=diff&rev=126023&p1=xmlbeans/trunk/external/lib/oldxbean.jar&r1=126022&p2=xmlbeans/trunk/external/lib/oldxbean.jar&r2=126023
==============================================================================
Binary files. No diff available.
Added: xmlbeans/trunk/src/configschema/schema/xmlconfig.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/configschema/schema/xmlconfig.xsdconfig?view=auto&rev=126023
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/src/configschema/schema/xmlconfig.xsdconfig Sat Jan 22 00:40:28 2005
@@ -0,0 +1,17 @@
+<!-- Copyright 2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+ <xb:namespace uri="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+ <xb:package>org.apache.xmlbeans.impl.xb.xmlconfig</xb:package>
+ </xb:namespace>
+
+</xb:config>
Modified: xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java&r1=126022&p2=xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java (original)
+++ xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java Sat Jan 22 00:40:28 2005
@@ -20,7 +20,7 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.XmlError;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.apache.xmlbeans.impl.inst2xsd.util.TypeSystemHolder;
import org.apache.xmlbeans.impl.tool.CommandLine;
Modified: xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java&r1=126022&p2=xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java (original)
+++ xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java Sat Jan 22 00:40:28 2005
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.inst2xsd.util;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.apache.xmlbeans.XmlString;
import org.apache.xmlbeans.XmlQName;
import org.apache.xmlbeans.XmlCursor;
@@ -140,15 +140,15 @@
return schDoc;
}
- private static org.w3.x2001.xmlSchema.SchemaDocument.Schema getTopLevelSchemaElement(SchemaDocument schDoc,
+ private static org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema getTopLevelSchemaElement(SchemaDocument schDoc,
String tns)
{
- org.w3.x2001.xmlSchema.SchemaDocument.Schema sch = schDoc.getSchema();
+ org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema sch = schDoc.getSchema();
if (sch==null)
{
sch = schDoc.addNewSchema();
- sch.setAttributeFormDefault(org.w3.x2001.xmlSchema.FormChoice.Enum.forString("unqualified"));
- sch.setElementFormDefault(org.w3.x2001.xmlSchema.FormChoice.Enum.forString("qualified"));
+ sch.setAttributeFormDefault(org.apache.xmlbeans.impl.xb.xsdschema.FormChoice.Enum.forString("unqualified"));
+ sch.setElementFormDefault(org.apache.xmlbeans.impl.xb.xsdschema.FormChoice.Enum.forString("qualified"));
if (!tns.equals(""))
sch.setTargetNamespace(tns);
}
@@ -160,9 +160,9 @@
{
assert tns.equals(globalElement.getName().getNamespaceURI());
- org.w3.x2001.xmlSchema.SchemaDocument.Schema sch = getTopLevelSchemaElement(schDoc, tns);
+ org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema sch = getTopLevelSchemaElement(schDoc, tns);
- org.w3.x2001.xmlSchema.TopLevelElement topLevelElem = sch.addNewElement();
+ org.apache.xmlbeans.impl.xb.xsdschema.TopLevelElement topLevelElem = sch.addNewElement();
topLevelElem.setName(globalElement.getName().getLocalPart());
if (globalElement.isNillable())
@@ -174,7 +174,7 @@
fillUpTypeOnElement(elemType, topLevelElem, tns);
}
- private void fillUpLocalElement(Element element, org.w3.x2001.xmlSchema.LocalElement localSElement, String tns)
+ private void fillUpLocalElement(Element element, org.apache.xmlbeans.impl.xb.xsdschema.LocalElement localSElement, String tns)
{
fillUpElementDocumentation(localSElement, element.getComment());
if (!element.isRef())
@@ -202,7 +202,7 @@
localSElement.setNillable(element.isNillable());
}
- private void fillUpTypeOnElement(Type elemType, org.w3.x2001.xmlSchema.Element parentSElement, String tns)
+ private void fillUpTypeOnElement(Type elemType, org.apache.xmlbeans.impl.xb.xsdschema.Element parentSElement, String tns)
{
if (elemType.isGlobal())
{
@@ -218,15 +218,15 @@
}
else
{
- org.w3.x2001.xmlSchema.LocalComplexType localComplexType = parentSElement.addNewComplexType();
+ org.apache.xmlbeans.impl.xb.xsdschema.LocalComplexType localComplexType = parentSElement.addNewComplexType();
fillUpContentForComplexType(elemType, localComplexType, tns);
}
}
- private void fillUpEnumeration(Type type, org.w3.x2001.xmlSchema.Element parentSElement)
+ private void fillUpEnumeration(Type type, org.apache.xmlbeans.impl.xb.xsdschema.Element parentSElement)
{
assert type.isEnumeration() && !type.isComplexType() : "Enumerations must be on simple types only.";
- org.w3.x2001.xmlSchema.RestrictionDocument.Restriction restriction = parentSElement.addNewSimpleType().addNewRestriction();
+ org.apache.xmlbeans.impl.xb.xsdschema.RestrictionDocument.Restriction restriction = parentSElement.addNewSimpleType().addNewRestriction();
restriction.setBase(type.getName());
if (type.isQNameEnumeration())
{
@@ -235,7 +235,7 @@
QName value = (QName) type.getEnumerationQNames().get(i);
XmlQName xqname = XmlQName.Factory.newValue(value);
- org.w3.x2001.xmlSchema.NoFixedFacet enumSElem = restriction.addNewEnumeration();
+ org.apache.xmlbeans.impl.xb.xsdschema.NoFixedFacet enumSElem = restriction.addNewEnumeration();
XmlCursor xc = enumSElem.newCursor();
String newPrefix = xc.prefixForNamespace(value.getNamespaceURI());
@@ -256,28 +256,28 @@
}
private void fillUpAttributesInComplexTypesSimpleContent(Type elemType,
- org.w3.x2001.xmlSchema.SimpleExtensionType sExtension, String tns)
+ org.apache.xmlbeans.impl.xb.xsdschema.SimpleExtensionType sExtension, String tns)
{
for (int i = 0; i < elemType.getAttributes().size(); i++)
{
Attribute att = (Attribute) elemType.getAttributes().get(i);
- org.w3.x2001.xmlSchema.Attribute sAttribute = sExtension.addNewAttribute();
+ org.apache.xmlbeans.impl.xb.xsdschema.Attribute sAttribute = sExtension.addNewAttribute();
fillUpLocalAttribute(att, sAttribute, tns);
}
}
private void fillUpAttributesInComplexTypesComplexContent(Type elemType,
- org.w3.x2001.xmlSchema.ComplexType localSComplexType, String tns)
+ org.apache.xmlbeans.impl.xb.xsdschema.ComplexType localSComplexType, String tns)
{
for (int i = 0; i < elemType.getAttributes().size(); i++)
{
Attribute att = (Attribute) elemType.getAttributes().get(i);
- org.w3.x2001.xmlSchema.Attribute sAttribute = localSComplexType.addNewAttribute();
+ org.apache.xmlbeans.impl.xb.xsdschema.Attribute sAttribute = localSComplexType.addNewAttribute();
fillUpLocalAttribute(att, sAttribute, tns);
}
}
- private void fillUpLocalAttribute(Attribute att, org.w3.x2001.xmlSchema.Attribute sAttribute, String tns)
+ private void fillUpLocalAttribute(Attribute att, org.apache.xmlbeans.impl.xb.xsdschema.Attribute sAttribute, String tns)
{
if (att.isRef())
{
@@ -289,19 +289,19 @@
sAttribute.setType(att.getType().getName());
sAttribute.setName(att.getName().getLocalPart());
if (att.isOptional())
- sAttribute.setUse(org.w3.x2001.xmlSchema.Attribute.Use.OPTIONAL);
+ sAttribute.setUse(org.apache.xmlbeans.impl.xb.xsdschema.Attribute.Use.OPTIONAL);
}
}
- private void fillUpContentForComplexType(Type type, org.w3.x2001.xmlSchema.ComplexType sComplexType, String tns)
+ private void fillUpContentForComplexType(Type type, org.apache.xmlbeans.impl.xb.xsdschema.ComplexType sComplexType, String tns)
{
if (type.getContentType()==Type.COMPLEX_TYPE_SIMPLE_CONTENT)
{
- org.w3.x2001.xmlSchema.SimpleContentDocument.SimpleContent simpleContent = sComplexType.addNewSimpleContent();
+ org.apache.xmlbeans.impl.xb.xsdschema.SimpleContentDocument.SimpleContent simpleContent = sComplexType.addNewSimpleContent();
assert type.getExtensionType()!=null && type.getExtensionType().getName()!=null : "Extension type must exist and be named for a COMPLEX_TYPE_SIMPLE_CONTENT";
- org.w3.x2001.xmlSchema.SimpleExtensionType ext = simpleContent.addNewExtension();
+ org.apache.xmlbeans.impl.xb.xsdschema.SimpleExtensionType ext = simpleContent.addNewExtension();
ext.setBase(type.getExtensionType().getName());
fillUpAttributesInComplexTypesSimpleContent(type, ext, tns);
@@ -313,7 +313,7 @@
sComplexType.setMixed(true);
}
- org.w3.x2001.xmlSchema.ExplicitGroup explicitGroup;
+ org.apache.xmlbeans.impl.xb.xsdschema.ExplicitGroup explicitGroup;
if (type.getTopParticleForComplexOrMixedContent()==Type.PARTICLE_SEQUENCE)
{
explicitGroup = sComplexType.addNewSequence();
@@ -330,7 +330,7 @@
{
Element child = (Element) type.getElements().get(i);
assert !child.isGlobal();
- org.w3.x2001.xmlSchema.LocalElement childLocalElement = explicitGroup.addNewElement();
+ org.apache.xmlbeans.impl.xb.xsdschema.LocalElement childLocalElement = explicitGroup.addNewElement();
fillUpLocalElement(child, childLocalElement, tns);
}
@@ -342,9 +342,9 @@
private void fillUpGlobalAttribute(Attribute globalAttribute, SchemaDocument schDoc, String tns)
{
assert tns.equals(globalAttribute.getName().getNamespaceURI());
- org.w3.x2001.xmlSchema.SchemaDocument.Schema sch = getTopLevelSchemaElement(schDoc, tns);
+ org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema sch = getTopLevelSchemaElement(schDoc, tns);
- org.w3.x2001.xmlSchema.TopLevelAttribute topLevelAtt = sch.addNewAttribute();
+ org.apache.xmlbeans.impl.xb.xsdschema.TopLevelAttribute topLevelAtt = sch.addNewAttribute();
topLevelAtt.setName(globalAttribute.getName().getLocalPart());
Type elemType = globalAttribute.getType();
@@ -355,16 +355,16 @@
}
else
{
- //org.w3.x2001.xmlSchema.LocalSimpleType localSimpleType = topLevelAtt.addNewSimpleType();
+ //org.apache.xmlbeans.impl.xb.xsdschema.LocalSimpleType localSimpleType = topLevelAtt.addNewSimpleType();
throw new IllegalStateException();
}
}
- private static void fillUpElementDocumentation(org.w3.x2001.xmlSchema.Element element, String comment)
+ private static void fillUpElementDocumentation(org.apache.xmlbeans.impl.xb.xsdschema.Element element, String comment)
{
if (comment!=null && comment.length()>0)
{
- org.w3.x2001.xmlSchema.DocumentationDocument.Documentation documentation = element.addNewAnnotation().addNewDocumentation();
+ org.apache.xmlbeans.impl.xb.xsdschema.DocumentationDocument.Documentation documentation = element.addNewAnnotation().addNewDocumentation();
documentation.set(org.apache.xmlbeans.XmlString.Factory.newValue(comment));
}
}
@@ -373,9 +373,9 @@
private void fillUpGlobalType(Type globalType, SchemaDocument schDoc, String tns)
{
assert tns.equals(globalType.getName().getNamespaceURI());
- org.w3.x2001.xmlSchema.SchemaDocument.Schema sch = getTopLevelSchemaElement(schDoc, tns);
+ org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema sch = getTopLevelSchemaElement(schDoc, tns);
- org.w3.x2001.xmlSchema.TopLevelComplexType topLevelComplexType = sch.addNewComplexType();
+ org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType topLevelComplexType = sch.addNewComplexType();
topLevelComplexType.setName(globalType.getName().getLocalPart());
fillUpContentForComplexType(globalType, topLevelComplexType, tns);
Added: xmlbeans/trunk/src/toolschema/ltgfmt.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/toolschema/ltgfmt.xsdconfig?view=auto&rev=126023
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/src/toolschema/ltgfmt.xsdconfig Sat Jan 22 00:40:28 2005
@@ -0,0 +1,17 @@
+<!-- Copyright 2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+ <xb:namespace uri="http://www.bea.com/2003/05/xmlbean/ltgfmt">
+ <xb:package>org.apache.xmlbeans.impl.xb.ltgfmt</xb:package>
+ </xb:namespace>
+
+</xb:config>
Added: xmlbeans/trunk/src/toolschema/substwsdl.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/toolschema/substwsdl.xsdconfig?view=auto&rev=126023
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/src/toolschema/substwsdl.xsdconfig Sat Jan 22 00:40:28 2005
@@ -0,0 +1,17 @@
+<!-- Copyright 2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+ <xb:namespace uri="http://www.apache.org/internal/xmlbeans/wsdlsubst">
+ <xb:package>org.apache.xmlbeans.impl.xb.substwsdl</xb:package>
+ </xb:namespace>
+
+</xb:config>
Added: xmlbeans/trunk/src/toolschema/xsdownload.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/toolschema/xsdownload.xsdconfig?view=auto&rev=126023
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/src/toolschema/xsdownload.xsdconfig Sat Jan 22 00:40:28 2005
@@ -0,0 +1,17 @@
+<!-- Copyright 2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+ <xb:namespace uri="http://www.bea.com/2003/01/xmlbean/xsdownload">
+ <xb:package>org.apache.xmlbeans.impl.xb.xsdownload</xb:package>
+ </xb:namespace>
+
+</xb:config>
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/FilerImpl.java Sat Jan 22 00:40:28 2005
@@ -16,7 +16,6 @@
package org.apache.xmlbeans.impl.schema;
import org.apache.xmlbeans.Filer;
-import org.apache.xmlbeans.impl.common.IOUtil;
import java.io.OutputStream;
import java.io.IOException;
@@ -28,7 +27,6 @@
import java.util.Set;
import java.util.HashSet;
import java.util.List;
-import java.util.Collections;
import java.util.ArrayList;
import repackage.Repackager;
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java Sat Jan 22 00:40:28 2005
@@ -24,10 +24,10 @@
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.w3.x2001.xmlSchema.AppinfoDocument;
-import org.w3.x2001.xmlSchema.Annotated;
-import org.w3.x2001.xmlSchema.AnnotationDocument;
-import org.w3.x2001.xmlSchema.DocumentationDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.AppinfoDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.Annotated;
+import org.apache.xmlbeans.impl.xb.xsdschema.AnnotationDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.DocumentationDocument;
import org.apache.xmlbeans.SchemaComponent;
public class SchemaAnnotationImpl implements SchemaAnnotation
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java Sat Jan 22 00:40:28 2005
@@ -54,7 +54,7 @@
private Map _documentCache;
private Map _classnameCache;
- public static String LOAD_METADATA_PACKAGE = SchemaTypeSystemImpl.METADATA_PACKAGE;
+ public static String METADATA_PACKAGE_LOAD = SchemaTypeSystemImpl.METADATA_PACKAGE_GEN;
// The following maintains a cache of SchemaTypeLoaders per ClassLoader per Thread.
// I use soft references to allow the garbage collector to reclain the type loaders
@@ -320,7 +320,7 @@
if (_searchPath[i].isNamespaceDefined(namespace))
return true;
- SchemaTypeSystem sts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/namespace/", new QName(namespace, "xmlns"));
+ SchemaTypeSystem sts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/namespace/", new QName(namespace, "xmlns"));
return (sts != null);
}
@@ -334,7 +334,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/type/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/type/", name);
if (ts != null)
{
result = ts.findTypeRef(name);
@@ -358,7 +358,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForClassname("schema" + LOAD_METADATA_PACKAGE + "/javaname/", classname);
+ SchemaTypeSystem ts = typeSystemForClassname("schema" + METADATA_PACKAGE_LOAD + "/javaname/", classname);
if (ts != null)
{
result = ts.typeForClassname(classname);
@@ -380,7 +380,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/element/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/element/", name);
if (ts != null)
{
result = ts.findDocumentTypeRef(name);
@@ -402,7 +402,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/attribute/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/attribute/", name);
if (ts != null)
{
result = ts.findAttributeTypeRef(name);
@@ -424,7 +424,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/element/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/element/", name);
if (ts != null)
{
result = ts.findElementRef(name);
@@ -446,7 +446,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/attribute/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/attribute/", name);
if (ts != null)
{
result = ts.findAttributeRef(name);
@@ -468,7 +468,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/modelgroup/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/modelgroup/", name);
if (ts != null)
{
result = ts.findModelGroupRef(name);
@@ -490,7 +490,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/attributegroup/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/attributegroup/", name);
if (ts != null)
{
result = ts.findAttributeGroupRef(name);
@@ -512,7 +512,7 @@
break;
if (result == null)
{
- SchemaTypeSystem ts = typeSystemForComponent("schema" + LOAD_METADATA_PACKAGE + "/identityconstraint/", name);
+ SchemaTypeSystem ts = typeSystemForComponent("schema" + METADATA_PACKAGE_LOAD + "/identityconstraint/", name);
if (ts != null)
{
result = ts.findIdentityConstraintRef(name);
@@ -532,10 +532,10 @@
sourceName = "/" + sourceName;
if (_resourceLoader != null)
- result = _resourceLoader.getResourceAsStream("schema" + LOAD_METADATA_PACKAGE + "/src" + sourceName);
+ result = _resourceLoader.getResourceAsStream("schema" + METADATA_PACKAGE_LOAD + "/src" + sourceName);
if (result == null && _classLoader != null)
- return _classLoader.getResourceAsStream("schema" + LOAD_METADATA_PACKAGE + "/src" + sourceName);
+ return _classLoader.getResourceAsStream("schema" + METADATA_PACKAGE_LOAD + "/src" + sourceName);
return result;
}
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java Sat Jan 22 00:40:28 2005
@@ -35,8 +35,8 @@
import java.util.Arrays;
import java.net.URI;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.apache.xmlbeans.impl.common.XmlErrorWatcher;
import java.util.Collection;
@@ -481,5 +481,4 @@
return success;
}
-
}
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java Sat Jan 22 00:40:28 2005
@@ -15,68 +15,65 @@
package org.apache.xmlbeans.impl.schema;
-import javax.xml.namespace.QName;
-import org.apache.xmlbeans.impl.common.NameUtil;
-import org.apache.xmlbeans.impl.common.QNameHelper;
-import org.apache.xmlbeans.impl.common.XBeanDebug;
-import org.apache.xmlbeans.impl.common.XmlErrorWatcher;
-
-import java.io.InputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Writer;
-import java.util.*;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipEntry;
-import java.math.BigInteger;
-
-
-import org.apache.xmlbeans.impl.regex.RegularExpression;
-import org.apache.xmlbeans.impl.util.HexBin;
-import org.apache.xmlbeans.impl.values.XmlObjectBase;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.SchemaGlobalElement;
+import org.apache.xmlbeans.Filer;
+import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.SchemaAnnotation;
-import org.apache.xmlbeans.SchemaComponent;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.SchemaParticle;
-import org.apache.xmlbeans.SchemaGlobalAttribute;
-import org.apache.xmlbeans.SchemaModelGroup;
import org.apache.xmlbeans.SchemaAttributeGroup;
import org.apache.xmlbeans.SchemaAttributeModel;
-import org.apache.xmlbeans.SchemaTypeLoader;
-import org.apache.xmlbeans.SchemaProperty;
-import org.apache.xmlbeans.QNameSet;
+import org.apache.xmlbeans.SchemaComponent;
+import org.apache.xmlbeans.SchemaField;
+import org.apache.xmlbeans.SchemaGlobalAttribute;
+import org.apache.xmlbeans.SchemaGlobalElement;
+import org.apache.xmlbeans.SchemaIdentityConstraint;
import org.apache.xmlbeans.SchemaLocalAttribute;
import org.apache.xmlbeans.SchemaLocalElement;
-import org.apache.xmlbeans.XmlAnySimpleType;
+import org.apache.xmlbeans.SchemaModelGroup;
+import org.apache.xmlbeans.SchemaParticle;
+import org.apache.xmlbeans.SchemaProperty;
import org.apache.xmlbeans.SchemaStringEnumEntry;
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.SchemaTypeLoaderException;
import org.apache.xmlbeans.SchemaTypeSystem;
-import org.apache.xmlbeans.SchemaIdentityConstraint;
import org.apache.xmlbeans.SimpleValue;
-import org.apache.xmlbeans.SchemaTypeLoaderException;
-import org.apache.xmlbeans.SchemaField;
-import org.apache.xmlbeans.Filer;
+import org.apache.xmlbeans.XmlAnySimpleType;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.apache.xmlbeans.impl.common.NameUtil;
+import org.apache.xmlbeans.impl.common.QNameHelper;
+import org.apache.xmlbeans.impl.common.XBeanDebug;
+import org.apache.xmlbeans.impl.util.HexBin;
+import org.apache.xmlbeans.impl.values.XmlObjectBase;
+import org.apache.xmlbeans.impl.xb.xsdschema.AttributeGroupDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.GroupDocument;
import org.apache.xmlbeans.soap.SOAPArrayType;
import org.apache.xmlbeans.soap.SchemaWSDLArrayType;
-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;
-import org.w3.x2001.xmlSchema.AppinfoDocument;
-import org.w3.x2001.xmlSchema.DocumentationDocument;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-
import repackage.Repackager;
+import javax.xml.namespace.QName;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
public class SchemaTypeSystemImpl extends SchemaTypeLoaderBase implements SchemaTypeSystem
{
public static final int DATA_BABE = 0xDA7ABABE;
@@ -135,21 +132,29 @@
static final int FLAG_ABSTRACT = 0x40000;
static final int FLAG_ATTRIBUTE_TYPE = 0x80000;
-// /**
-// * This is to support the feature of a separate/private XMLBeans distribution that will not colide with the public org apache xmlbeans one.
-// * METADATA_PACKAGE will be "" for the original and something like com_mycompany_private_xmlbeans for a private distribution of XMLBeans.
-// */
-// public static String METADATA_PACKAGE = (
-// // next line should use String addition to avoid replacemant be Repackager: "org." + "apache." + "xmlbeans"
-// ("org." + "apache." + "xmlbeans").equals(SchemaTypeSystem.class.getPackage().getName()) ?
-// // This is the original org apache xmlbeans package, to maintain backwards compatibility resource pathes must remain the same
-// "" :
-// // This is the private package XMLBeans, all the metadata will end up in a specific/private resource path
-// // It is by design that
-// SchemaTypeSystem.class.getPackage().getName().replaceAll("\\.", "_")
-// );
- // not yet enabled
- public static String METADATA_PACKAGE = "";
+ /**
+ * This is to support the feature of a separate/private XMLBeans
+ * distribution that will not colide with the public org apache
+ * xmlbeans one.
+ * METADATA_PACKAGE_GEN will be "" for the original and something like
+ * com_mycompany_private_xmlbeans for a private distribution of XMLBeans.
+ *
+ * There are two properties:
+ * METADATA_PACKAGE_GEN - used for generating metadata
+ * and METADATA_PACKAGE_LOAD - used for loading the metadata.
+ * Most of the time the have the same value, with one exception, during the
+ * repackage process scomp needs to load from old package and generate into
+ * a new package.
+ */
+ public static String METADATA_PACKAGE_GEN = (
+ // next line should use String addition to avoid replacement by Repackager: "org." + "apache." + "xmlbeans"
+ ("org." + "apache." + "xmlbeans").equals(SchemaTypeSystem.class.getPackage().getName()) ?
+ // This is the original org apache xmlbeans package, to maintain backwards compatibility resource pathes must remain the same
+ "" :
+ // This is the private package XMLBeans, all the metadata will end up in a specific/private resource path
+ SchemaTypeSystem.class.getPackage().getName().replaceAll("\\.", "_")
+ );
+
private static String nameToPathString(String nameForSystem)
{
@@ -317,17 +322,17 @@
void savePointers()
{
- savePointersForComponents(globalElements(), "schema" + METADATA_PACKAGE + "/element/");
- savePointersForComponents(globalAttributes(), "schema" + METADATA_PACKAGE + "/attribute/");
- savePointersForComponents(modelGroups(), "schema" + METADATA_PACKAGE + "/modelgroup/");
- savePointersForComponents(attributeGroups(), "schema" + METADATA_PACKAGE + "/attributegroup/");
- savePointersForComponents(globalTypes(), "schema" + METADATA_PACKAGE + "/type/");
- savePointersForComponents(identityConstraints(), "schema" + METADATA_PACKAGE + "/identityconstraint/");
- savePointersForNamespaces(_namespaces, "schema" + METADATA_PACKAGE + "/namespace/");
- savePointersForClassnames(_typeRefsByClassname.keySet(), "schema" + METADATA_PACKAGE + "/javaname/");
- savePointersForComponents(redefinedModelGroups(), "schema" + METADATA_PACKAGE + "/redefinedmodelgroup/");
- savePointersForComponents(redefinedAttributeGroups(), "schema" + METADATA_PACKAGE + "/redefinedattributegroup/");
- savePointersForComponents(redefinedGlobalTypes(), "schema" + METADATA_PACKAGE + "/redefinedtype/");
+ savePointersForComponents(globalElements(), "schema" + METADATA_PACKAGE_GEN + "/element/");
+ savePointersForComponents(globalAttributes(), "schema" + METADATA_PACKAGE_GEN + "/attribute/");
+ savePointersForComponents(modelGroups(), "schema" + METADATA_PACKAGE_GEN + "/modelgroup/");
+ savePointersForComponents(attributeGroups(), "schema" + METADATA_PACKAGE_GEN + "/attributegroup/");
+ savePointersForComponents(globalTypes(), "schema" + METADATA_PACKAGE_GEN + "/type/");
+ savePointersForComponents(identityConstraints(), "schema" + METADATA_PACKAGE_GEN + "/identityconstraint/");
+ savePointersForNamespaces(_namespaces, "schema" + METADATA_PACKAGE_GEN + "/namespace/");
+ savePointersForClassnames(_typeRefsByClassname.keySet(), "schema" + METADATA_PACKAGE_GEN + "/javaname/");
+ savePointersForComponents(redefinedModelGroups(), "schema" + METADATA_PACKAGE_GEN + "/redefinedmodelgroup/");
+ savePointersForComponents(redefinedAttributeGroups(), "schema" + METADATA_PACKAGE_GEN + "/redefinedattributegroup/");
+ savePointersForComponents(redefinedGlobalTypes(), "schema" + METADATA_PACKAGE_GEN + "/redefinedtype/");
}
void savePointersForComponents(SchemaComponent[] components, String dir)
@@ -886,7 +891,7 @@
nameForSystem = "s" + new String(HexBin.encode(bytes));
}
- _name = "schema" + METADATA_PACKAGE + ".system." + nameForSystem;
+ _name = "schema" + METADATA_PACKAGE_GEN + ".system." + nameForSystem;
_basePackage = nameToPathString(_name);
_classloader = null;
@@ -1876,7 +1881,7 @@
XmlObject[] documentationItems = a.getUserInformation();
writeInt(documentationItems.length);
XmlOptions opt = new XmlOptions().setSaveOuter().
- setSaveAggresiveNamespaces();
+ setSaveAggressiveNamespaces();
for (int i = 0; i < documentationItems.length; i++)
{
XmlObject doc = documentationItems[i];
@@ -3584,7 +3589,7 @@
if (!sourceName.startsWith("/"))
sourceName = "/" + sourceName;
- return _resourceLoader.getResourceAsStream("schema" + METADATA_PACKAGE + "/src" + sourceName);
+ return _resourceLoader.getResourceAsStream("schema" + METADATA_PACKAGE_GEN + "/src" + sourceName);
}
SchemaContainer[] containers()
@@ -3740,4 +3745,3 @@
return null;
}
}
-
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java Sat Jan 22 00:40:28 2005
@@ -19,9 +19,9 @@
import java.util.*;
import java.util.List;
-import org.w3.x2001.xmlSchema.*;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-import org.w3.x2001.xmlSchema.AnyDocument.Any;
+import org.apache.xmlbeans.impl.xb.xsdschema.*;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.AnyDocument.Any;
import javax.xml.namespace.QName;
import org.apache.xmlbeans.XmlErrorCodes;
import org.apache.xmlbeans.impl.common.QNameHelper;
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?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java Sat Jan 22 00:40:28 2005
@@ -15,11 +15,11 @@
package org.apache.xmlbeans.impl.schema;
-import org.w3.x2001.xmlSchema.RedefineDocument.Redefine;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.ImportDocument.Import;
-import org.w3.x2001.xmlSchema.IncludeDocument.Include;
+import org.apache.xmlbeans.impl.xb.xsdschema.RedefineDocument.Redefine;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.ImportDocument.Import;
+import org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument.Include;
import java.util.Map;
import java.util.List;
@@ -870,7 +870,7 @@
InputStream in = null;
URL url = new URL(urlLoc);
- // Copy the file from filepath to schema[METADATA_PACKAGE]/src/<schemaFile>
+ // Copy the file from filepath to schema[METADATA_PACKAGE_GEN]/src/<schemaFile>
in = url.openStream();
FileOutputStream out = new FileOutputStream(targetFile);
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java Sat Jan 22 00:40:28 2005
@@ -25,12 +25,12 @@
import java.util.*;
-import org.w3.x2001.xmlSchema.TopLevelElement;
-import org.w3.x2001.xmlSchema.TopLevelAttribute;
-import org.w3.x2001.xmlSchema.SimpleType;
-import org.w3.x2001.xmlSchema.Attribute;
-import org.w3.x2001.xmlSchema.Element;
-import org.w3.x2001.xmlSchema.KeyrefDocument.Keyref;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelElement;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelAttribute;
+import org.apache.xmlbeans.impl.xb.xsdschema.SimpleType;
+import org.apache.xmlbeans.impl.xb.xsdschema.Attribute;
+import org.apache.xmlbeans.impl.xb.xsdschema.Element;
+import org.apache.xmlbeans.impl.xb.xsdschema.KeyrefDocument.Keyref;
import javax.xml.namespace.QName;
public class StscResolver
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java Sat Jan 22 00:40:28 2005
@@ -35,8 +35,8 @@
import org.apache.xmlbeans.XmlUnsignedByte;
import org.apache.xmlbeans.XmlPositiveInteger;
import org.apache.xmlbeans.XmlNonNegativeInteger;
-import org.w3.x2001.xmlSchema.*;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.*;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
public class StscSimpleTypeResolver
{
@@ -165,7 +165,7 @@
sImpl.setPrimitiveTypeRef(BuiltinSchemaTypeSystem.ST_ANY_SIMPLE.getRef());
}
- static void resolveListType(SchemaTypeImpl sImpl, org.w3.x2001.xmlSchema.ListDocument.List parseList, List anonTypes)
+ static void resolveListType(SchemaTypeImpl sImpl, org.apache.xmlbeans.impl.xb.xsdschema.ListDocument.List parseList, List anonTypes)
{
StscState state = StscState.get();
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java Sat Jan 22 00:40:28 2005
@@ -44,7 +44,7 @@
import javax.xml.namespace.QName;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.xml.sax.EntityResolver;
/**
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?view=diff&rev=126023&p1=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java&r1=126022&p2=xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java Sat Jan 22 00:40:28 2005
@@ -15,43 +15,58 @@
package org.apache.xmlbeans.impl.schema;
-import java.util.*;
-import java.util.List;
-import java.math.BigInteger;
-
-import org.w3.x2001.xmlSchema.*;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-import org.w3.x2001.xmlSchema.RedefineDocument.Redefine;
-
-import org.apache.xmlbeans.XmlErrorCodes;
-import org.apache.xmlbeans.impl.common.QNameHelper;
-import org.apache.xmlbeans.impl.common.XMLChar;
-import org.apache.xmlbeans.impl.common.XPath;
-import org.apache.xmlbeans.impl.values.XmlIntegerImpl;
-import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
-import org.apache.xmlbeans.impl.values.NamespaceContext;
-import org.apache.xmlbeans.impl.values.XmlPositiveIntegerImpl;
-import org.apache.xmlbeans.impl.values.XmlNonNegativeIntegerImpl;
-import org.apache.xmlbeans.impl.regex.RegularExpression;
-import org.apache.xmlbeans.soap.SOAPArrayType;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.SchemaGlobalElement;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.SchemaParticle;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.QNameSetBuilder;
+import org.apache.xmlbeans.SchemaAttributeModel;
import org.apache.xmlbeans.SchemaBookmark;
+import org.apache.xmlbeans.SchemaGlobalAttribute;
+import org.apache.xmlbeans.SchemaGlobalElement;
import org.apache.xmlbeans.SchemaIdentityConstraint;
-import org.apache.xmlbeans.SchemaAttributeModel;
import org.apache.xmlbeans.SchemaLocalAttribute;
-import org.apache.xmlbeans.SchemaGlobalAttribute;
+import org.apache.xmlbeans.SchemaParticle;
+import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlAnySimpleType;
-import org.apache.xmlbeans.XmlInteger;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlErrorCodes;
import org.apache.xmlbeans.XmlNonNegativeInteger;
+import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlPositiveInteger;
+import org.apache.xmlbeans.impl.common.QNameHelper;
+import org.apache.xmlbeans.impl.common.XMLChar;
+import org.apache.xmlbeans.impl.common.XPath;
+import org.apache.xmlbeans.impl.values.NamespaceContext;
+import org.apache.xmlbeans.impl.values.XmlNonNegativeIntegerImpl;
+import org.apache.xmlbeans.impl.values.XmlPositiveIntegerImpl;
+import org.apache.xmlbeans.impl.values.XmlValueOutOfRangeException;
+import org.apache.xmlbeans.impl.xb.xsdschema.Annotated;
+import org.apache.xmlbeans.impl.xb.xsdschema.AnnotationDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.Attribute;
+import org.apache.xmlbeans.impl.xb.xsdschema.AttributeGroup;
+import org.apache.xmlbeans.impl.xb.xsdschema.Element;
+import org.apache.xmlbeans.impl.xb.xsdschema.FieldDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.FormChoice;
+import org.apache.xmlbeans.impl.xb.xsdschema.Keybase;
+import org.apache.xmlbeans.impl.xb.xsdschema.KeyrefDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.LocalElement;
+import org.apache.xmlbeans.impl.xb.xsdschema.LocalSimpleType;
+import org.apache.xmlbeans.impl.xb.xsdschema.NamedAttributeGroup;
+import org.apache.xmlbeans.impl.xb.xsdschema.NamedGroup;
+import org.apache.xmlbeans.impl.xb.xsdschema.RedefineDocument.Redefine;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelAttribute;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelElement;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelSimpleType;
+import org.apache.xmlbeans.soap.SOAPArrayType;
import javax.xml.namespace.QName;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class StscTranslator
{
@@ -90,12 +105,12 @@
if (targetNamespace == null)
targetNamespace = "";
- SchemaContainer container = null;
+ //SchemaContainer container = null;
if (targetNamespace.length() > 0 || !isEmptySchema(schema))
{
state.registerContribution(targetNamespace, schema.documentProperties().getSourceName());
state.addNewContainer(targetNamespace);
- container = state.getContainer(targetNamespace);
+ //container = state.getContainer(targetNamespace);
}
List redefChain = new ArrayList();
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java Sat Jan 22 00:40:28 2005
@@ -15,9 +15,9 @@
package org.apache.xmlbeans.impl.tool;
-import com.bea.x2003.x01.xmlbean.xsdownload.DownloadedSchemasDocument;
-import com.bea.x2003.x01.xmlbean.xsdownload.DownloadedSchemaEntry;
-import com.bea.x2003.x01.xmlbean.xsdownload.DownloadedSchemasDocument.DownloadedSchemas;
+import org.apache.xmlbeans.impl.xb.xsdownload.DownloadedSchemasDocument;
+import org.apache.xmlbeans.impl.xb.xsdownload.DownloadedSchemaEntry;
+import org.apache.xmlbeans.impl.xb.xsdownload.DownloadedSchemasDocument.DownloadedSchemas;
import org.apache.xmlbeans.impl.util.HexBin;
import org.apache.xmlbeans.impl.common.IOUtil;
import org.apache.xmlbeans.XmlOptions;
@@ -40,8 +40,8 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
public abstract class BaseSchemaResourceManager extends SchemaImportResolver
{
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java Sat Jan 22 00:40:28 2005
@@ -98,14 +98,14 @@
{
ZipEntry ze = (ZipEntry) entries1.nextElement();
String name = ze.getName();
- if (name.startsWith("schema" + SchemaTypeSystemImpl.METADATA_PACKAGE + "/system/s") && name.endsWith(".xsb"))
+ if (name.startsWith("schema" + SchemaTypeSystemImpl.METADATA_PACKAGE_GEN + "/system/s") && name.endsWith(".xsb"))
list1.add(ze);
}
for (; entries2.hasMoreElements(); )
{
ZipEntry ze = (ZipEntry) entries2.nextElement();
String name = ze.getName();
- if (name.startsWith("schema" + SchemaTypeSystemImpl.METADATA_PACKAGE + "/system/s") && name.endsWith(".xsb"))
+ if (name.startsWith("schema" + SchemaTypeSystemImpl.METADATA_PACKAGE_GEN + "/system/s") && name.endsWith(".xsb"))
list2.add(ze);
}
ZipEntry[] files1 = (ZipEntry[]) list1.toArray(new ZipEntry[list1.size()]);
@@ -168,10 +168,10 @@
/**
* Navigate three directories deep to get to the type system.
- * Assume the schema[METADATA_PACKAGE]/system/* structure
+ * Assume the schema[METADATA_PACKAGE_LOAD]/system/* structure
*/
- File temp1 = new File(dir1, "schema" + SchemaTypeSystemImpl.METADATA_PACKAGE + "/system");
- File temp2 = new File(dir2, "schema" + SchemaTypeSystemImpl.METADATA_PACKAGE + "/system");
+ File temp1 = new File(dir1, "schema" + SchemaTypeSystemImpl.METADATA_PACKAGE_GEN + "/system");
+ File temp2 = new File(dir2, "schema" + SchemaTypeSystemImpl.METADATA_PACKAGE_GEN + "/system");
if (temp1.exists() && temp2.exists())
{
File[] files1 = temp1.listFiles();
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java Sat Jan 22 00:40:28 2005
@@ -15,15 +15,15 @@
package org.apache.xmlbeans.impl.tool;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.TopLevelComplexType;
-import org.w3.x2001.xmlSchema.TopLevelSimpleType;
-import org.w3.x2001.xmlSchema.TopLevelElement;
-import org.w3.x2001.xmlSchema.TopLevelAttribute;
-import org.w3.x2001.xmlSchema.NamedGroup;
-import org.w3.x2001.xmlSchema.NamedAttributeGroup;
-import org.w3.x2001.xmlSchema.FormChoice;
-import org.w3.x2001.xmlSchema.IncludeDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelSimpleType;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelElement;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelAttribute;
+import org.apache.xmlbeans.impl.xb.xsdschema.NamedGroup;
+import org.apache.xmlbeans.impl.xb.xsdschema.NamedAttributeGroup;
+import org.apache.xmlbeans.impl.xb.xsdschema.FormChoice;
+import org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument;
import java.util.Arrays;
import java.util.Set;
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java Sat Jan 22 00:40:28 2005
@@ -15,39 +15,48 @@
package org.apache.xmlbeans.impl.tool;
-import org.apache.xmlbeans.impl.schema.SchemaTypeSystemCompiler;
+import org.apache.xmlbeans.SchemaCodePrinter;
+import org.apache.xmlbeans.SchemaTypeLoader;
+import org.apache.xmlbeans.SchemaTypeSystem;
+import org.apache.xmlbeans.SimpleValue;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlErrorCodes;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.apache.xmlbeans.impl.common.IOUtil;
+import org.apache.xmlbeans.impl.common.ResolverUtil;
+import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
+import org.apache.xmlbeans.impl.common.XmlErrorWatcher;
import org.apache.xmlbeans.impl.schema.PathResourceLoader;
import org.apache.xmlbeans.impl.schema.ResourceLoader;
-import org.apache.xmlbeans.impl.schema.StscState;
import org.apache.xmlbeans.impl.schema.SchemaTypeLoaderImpl;
+import org.apache.xmlbeans.impl.schema.SchemaTypeSystemCompiler;
import org.apache.xmlbeans.impl.schema.SchemaTypeSystemImpl;
+import org.apache.xmlbeans.impl.schema.StscState;
import org.apache.xmlbeans.impl.schema.FilerImpl;
-import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
-import org.apache.xmlbeans.impl.common.XmlErrorWatcher;
-import org.apache.xmlbeans.impl.common.ResolverUtil;
-import org.apache.xmlbeans.impl.common.IOUtil;
import org.apache.xmlbeans.impl.common.JarHelper;
import org.apache.xmlbeans.impl.values.XmlListImpl;
+import org.apache.xmlbeans.impl.xb.xmlconfig.ConfigDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.xml.sax.EntityResolver;
import org.apache.xmlbeans.impl.config.BindingConfigImpl;
-import org.apache.xmlbeans.SchemaTypeSystem;
-import org.apache.xmlbeans.SchemaTypeLoader;
-import org.apache.xmlbeans.SchemaCodePrinter;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlErrorCodes;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.SimpleValue;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument;
import java.io.File;
import java.io.IOException;
-import java.util.*;
import java.net.URI;
import java.net.URL;
-
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.xml.sax.EntityResolver;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
import repackage.Repackager;
public class SchemaCompiler
@@ -790,12 +799,12 @@
XmlObject wsdldoc = loader.parse(wsdlFiles[i], null, options);
- if (!(wsdldoc instanceof org.apache.internal.xmlbeans.wsdlsubst.DefinitionsDocument))
+ if (!(wsdldoc instanceof org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument))
StscState.addError(errorListener, XmlErrorCodes.INVALID_DOCUMENT_TYPE,
new Object[] { wsdlFiles[i], "wsdl" }, wsdldoc);
else
{
- addWsdlSchemas(wsdlFiles[i].toString(), (org.apache.internal.xmlbeans.wsdlsubst.DefinitionsDocument)wsdldoc, errorListener, noVDoc, scontentlist);
+ addWsdlSchemas(wsdlFiles[i].toString(), (org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument)wsdldoc, errorListener, noVDoc, scontentlist);
}
}
catch (XmlException e)
@@ -825,14 +834,12 @@
XmlObject urldoc = loader.parse(urlFiles[i], null, options);
- boolean isXsd = false;
- if ((urldoc instanceof org.apache.internal.xmlbeans.wsdlsubst.DefinitionsDocument))
+ if ((urldoc instanceof org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument))
{
- addWsdlSchemas(urlFiles[i].toString(), (org.apache.internal.xmlbeans.wsdlsubst.DefinitionsDocument)urldoc, errorListener, noVDoc, scontentlist);
+ addWsdlSchemas(urlFiles[i].toString(), (org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument)urldoc, errorListener, noVDoc, scontentlist);
}
else if ((urldoc instanceof SchemaDocument))
{
- isXsd = true;
addSchema(urlFiles[i].toString(), (SchemaDocument)urldoc,
errorListener, noVDoc, scontentlist);
}
@@ -943,7 +950,7 @@
}
private static void addWsdlSchemas(String name,
- org.apache.internal.xmlbeans.wsdlsubst.DefinitionsDocument wsdldoc,
+ org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument wsdldoc,
XmlErrorWatcher errorListener, boolean noVDoc, List scontentlist)
{
if (wsdlContainsEncoded(wsdldoc))
@@ -1009,14 +1016,14 @@
if (repackage!=null)
{
- SchemaTypeLoaderImpl.LOAD_METADATA_PACKAGE = SchemaTypeSystemImpl.METADATA_PACKAGE;
+ SchemaTypeLoaderImpl.METADATA_PACKAGE_LOAD = SchemaTypeSystemImpl.METADATA_PACKAGE_GEN;
+
+ String stsPackage = SchemaTypeSystem.class.getPackage().getName();
+ Repackager repackager = new Repackager( repackage );
- // not yet enabled
- //String stsPackage = SchemaTypeSystem.class.getPackage().getName();
- //Repackager repackager = new Repackager( repackage );
+ SchemaTypeSystemImpl.METADATA_PACKAGE_GEN = repackager.repackage(new StringBuffer(stsPackage)).toString().replace('.','_');
- //SchemaTypeSystemImpl.METADATA_PACKAGE = repackager.repackage(new StringBuffer(stsPackage)).toString().replace('.','_');
- SchemaTypeSystemImpl.METADATA_PACKAGE = "";
+ System.out.println("\n\n\n" + stsPackage + ".SchemaCompiler Metadata LOAD:" + SchemaTypeLoaderImpl.METADATA_PACKAGE_LOAD + " GEN:" + SchemaTypeSystemImpl.METADATA_PACKAGE_GEN);
}
SchemaCodePrinter codePrinter = params.getSchemaCodePrinter();
@@ -1043,7 +1050,7 @@
boolean result = true;
- File schemasDir = IOUtil.createDir(classesDir, "schema" + SchemaTypeSystemImpl.METADATA_PACKAGE + "/src");
+ File schemasDir = IOUtil.createDir(classesDir, "schema" + SchemaTypeSystemImpl.METADATA_PACKAGE_GEN + "/src");
// build the in-memory type system
XmlErrorWatcher errorListener = new XmlErrorWatcher(outerErrorListener);
@@ -1065,6 +1072,7 @@
Repackager repackager = (repackage == null ? null : new Repackager(repackage));
FilerImpl filer = new FilerImpl(classesDir, srcDir, repackager, verbose, incrSrcGen);
+ // currently just for schemaCodePrinter
XmlOptions options = new XmlOptions();
if (codePrinter != null)
options.setSchemaCodePrinter(codePrinter);
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java Sat Jan 22 00:40:28 2005
@@ -19,8 +19,8 @@
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.impl.common.IOUtil;
-import org.apache.internal.xmlbeans.wsdlsubst.DefinitionsDocument;
-import org.apache.internal.xmlbeans.wsdlsubst.TImport;
+import org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument;
+import org.apache.xmlbeans.impl.xb.substwsdl.TImport;
import java.net.URI;
import java.net.URL;
@@ -32,9 +32,9 @@
import java.util.Iterator;
import java.io.File;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.ImportDocument;
-import org.w3.x2001.xmlSchema.IncludeDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.ImportDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument;
public class SchemaCopy
{
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java Sat Jan 22 00:40:28 2005
@@ -15,9 +15,9 @@
package org.apache.xmlbeans.impl.tool;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
-import org.w3.x2001.xmlSchema.ImportDocument.Import;
-import org.w3.x2001.xmlSchema.IncludeDocument.Include;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.ImportDocument.Import;
+import org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument.Include;
import java.util.LinkedList;
import java.util.Set;
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java Sat Jan 22 00:40:28 2005
@@ -35,7 +35,7 @@
import java.util.HashSet;
import java.io.File;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
public class TypeHierarchyPrinter
{
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java&r1=126022&p2=xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java Sat Jan 22 00:40:28 2005
@@ -15,8 +15,8 @@
package org.apache.xmlbeans.impl.tool;
-import com.bea.x2003.x05.xmlbean.ltgfmt.TestsDocument;
-import com.bea.x2003.x05.xmlbean.ltgfmt.FileDesc;
+import org.apache.xmlbeans.impl.xb.ltgfmt.TestsDocument;
+import org.apache.xmlbeans.impl.xb.ltgfmt.FileDesc;
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlError;
@@ -425,7 +425,7 @@
if (!doc.validate(ltgOptions))
throw new Exception("Document " + ltgFile + " not valid.");
- com.bea.x2003.x05.xmlbean.ltgfmt.TestCase[] testCases = doc.getTests().getTestArray();
+ org.apache.xmlbeans.impl.xb.ltgfmt.TestCase[] testCases = doc.getTests().getTestArray();
Collection result = new ArrayList();
for (int i = 0; i < testCases.length; i++)
Modified: xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java&r1=126022&p2=xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java (original)
+++ xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java Sat Jan 22 00:40:28 2005
@@ -15,10 +15,10 @@
package org.apache.xmlbeans.impl.config;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.ConfigDocument.Config;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Extensionconfig;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Nsconfig;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Qnameconfig;
+import org.apache.xmlbeans.impl.xb.xmlconfig.ConfigDocument.Config;
+import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
+import org.apache.xmlbeans.impl.xb.xmlconfig.Nsconfig;
+import org.apache.xmlbeans.impl.xb.xmlconfig.Qnameconfig;
import org.apache.xmlbeans.BindingConfig;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlError;
Modified: xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java&r1=126022&p2=xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java (original)
+++ xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java Sat Jan 22 00:40:28 2005
@@ -15,7 +15,7 @@
package org.apache.xmlbeans.impl.config;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Extensionconfig;
+import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
import org.apache.xmlbeans.InterfaceExtension;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.jam.JMethod;
Modified: xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java&r1=126022&p2=xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java (original)
+++ xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java Sat Jan 22 00:40:28 2005
@@ -20,7 +20,7 @@
import org.apache.xmlbeans.impl.jam.JamClassLoader;
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JMethod;
-import org.apache.xml.xmlbeans.x2004.x02.xbean.config.Extensionconfig;
+import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig;
public class PrePostExtensionImpl implements PrePostExtension
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java&r1=126022&p2=xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java Sat Jan 22 00:40:28 2005
@@ -17,9 +17,6 @@
import javax.xml.namespace.QName;
-//import org.w3.x2001.xmlSchema.AppinfoDocument;
-//import org.w3.x2001.xmlSchema.DocumentationDocument;
-
/**
* Represents a Schema annotation.
*/
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java?view=diff&rev=126023&p1=xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java&r1=126022&p2=xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java&r2=126023
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java Sat Jan 22 00:40:28 2005
@@ -309,5 +309,4 @@
{
this._expectedSchemaType = _expectedSchemaType;
}
-
}
Added: xmlbeans/trunk/src/xmlschema/schema/XML.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlschema/schema/XML.xsdconfig?view=auto&rev=126023
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/src/xmlschema/schema/XML.xsdconfig Sat Jan 22 00:40:28 2005
@@ -0,0 +1,17 @@
+<!-- Copyright 2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+ <xb:namespace uri="http://www.w3.org/XML/1998/namespace">
+ <xb:package>org.apache.xmlbeans.impl.xb.xmlschema</xb:package>
+ </xb:namespace>
+
+</xb:config>
Added: xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsdconfig
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsdconfig?view=auto&rev=126023
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsdconfig Sat Jan 22 00:40:28 2005
@@ -0,0 +1,17 @@
+<!-- Copyright 2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+
+ <xb:namespace uri="http://www.w3.org/2001/XMLSchema">
+ <xb:package>org.apache.xmlbeans.impl.xb.xsdschema</xb:package>
+ </xb:namespace>
+
+</xb:config>
Modified: xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java&r1=126022&p2=xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java Sat Jan 22 00:40:28 2005
@@ -24,8 +24,8 @@
import org.apache.xmlbeans.impl.tool.SchemaCompiler;
import org.apache.xmlbeans.impl.tool.CodeGenUtil;
import org.apache.xmlbeans.impl.tool.Diff;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.TopLevelComplexType;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
import org.apache.xmlbeans.SchemaBookmark;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.SchemaTypeSystem;
Modified: xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java&r1=126022&p2=xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/common/CompileTestBase.java Sat Jan 22 00:40:28 2005
@@ -20,7 +20,7 @@
import org.apache.xmlbeans.impl.tool.Diff;
import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
import org.apache.xmlbeans.*;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import javax.xml.namespace.QName;
import java.io.File;
Modified: xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java&r1=126022&p2=xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java Sat Jan 22 00:40:28 2005
@@ -24,8 +24,8 @@
import org.apache.xmlbeans.impl.tool.CodeGenUtil;
import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
import org.apache.xmlbeans.impl.tool.Diff;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.TopLevelComplexType;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
import org.apache.xmlbeans.*;
import java.io.File;
Modified: xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java&r1=126022&p2=xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java Sat Jan 22 00:40:28 2005
@@ -24,8 +24,8 @@
import org.apache.xmlbeans.impl.tool.CodeGenUtil;
import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
import org.apache.xmlbeans.impl.tool.Diff;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.TopLevelComplexType;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
import org.apache.xmlbeans.*;
import java.io.File;
Modified: xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java&r1=126022&p2=xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java Sat Jan 22 00:40:28 2005
@@ -24,8 +24,8 @@
import org.apache.xmlbeans.impl.tool.CodeGenUtil;
import org.apache.xmlbeans.impl.tool.SchemaCodeGenerator;
import org.apache.xmlbeans.impl.tool.Diff;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.TopLevelComplexType;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelComplexType;
import org.apache.xmlbeans.*;
import java.io.File;
Modified: xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java&r1=126022&p2=xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java (original)
+++ xmlbeans/trunk/test/src/drt/drtcases/MarshalTests.java Sat Jan 22 00:40:28 2005
@@ -49,7 +49,7 @@
import org.apache.xmlbeans.impl.marshal.BindingContextFactoryImpl;
import org.apache.xmlbeans.impl.marshal.util.ArrayUtils;
import org.apache.xmlbeans.impl.tool.PrettyPrinter;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.w3c.dom.Document;
import javax.xml.namespace.QName;
Modified: xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java&r1=126022&p2=xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java (original)
+++ xmlbeans/trunk/test/src/misc/checkin/RuntimeSchemaLoaderTest.java Sat Jan 22 00:40:28 2005
@@ -30,7 +30,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.w3.x2001.xmlSchema.SchemaDocument.Schema;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Schema;
import tools.util.*;
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java&r1=126022&p2=xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java Sat Jan 22 00:40:28 2005
@@ -10,7 +10,7 @@
import java.io.IOException;
import org.apache.xmlbeans.XmlObject;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
/**
* @author jacobd
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java&r1=126022&p2=xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdCommon.java Sat Jan 22 00:40:28 2005
@@ -2,7 +2,7 @@
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import java.util.Collection;
import java.util.ArrayList;
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java&r1=126022&p2=xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java Sat Jan 22 00:40:28 2005
@@ -3,7 +3,7 @@
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd;
import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import java.io.File;
import java.io.IOException;
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java&r1=126022&p2=xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java Sat Jan 22 00:40:28 2005
@@ -9,7 +9,7 @@
import java.io.IOException;
import org.apache.xmlbeans.XmlObject;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
/**
* @author jacobd
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java&r1=126022&p2=xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java Sat Jan 22 00:40:28 2005
@@ -13,7 +13,7 @@
import java.io.PrintStream;
import org.apache.xmlbeans.XmlObject;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
/**
* @author jacobd
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java&r1=126022&p2=xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/StoreTests.java Sat Jan 22 00:40:28 2005
@@ -151,7 +151,7 @@
x = XmlObject.Factory.parse(
"<schema xmlns='http://www.w3.org/2001/XMLSchema'/>" );
Assert.assertTrue(
- x.schemaType() == org.w3.x2001.xmlSchema.SchemaDocument.type );
+ x.schemaType() == org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.type );
x = XmlObject.Factory.parse(
"<schema xmlns='http://www.w3.org/2001/XMLSchema/moo'/>" );
@@ -160,16 +160,16 @@
x = XmlObject.Factory.parse(
"<schema xmlns='http://www.w3.org/2001/XMLSchema'/>" );
Assert.assertTrue(
- x.schemaType() == org.w3.x2001.xmlSchema.SchemaDocument.type );
+ x.schemaType() == org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.type );
- x = org.w3.x2001.xmlSchema.SchemaDocument.Factory.parse(
+ x = org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Factory.parse(
"<schema xmlns='http://www.w3.org/2001/XMLSchema'/>" );
Assert.assertTrue(
- x.schemaType() == org.w3.x2001.xmlSchema.SchemaDocument.type );
+ x.schemaType() == org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.type );
try {
x =
- org.w3.x2001.xmlSchema.SchemaDocument.Factory.parse(
+ org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Factory.parse(
"<schema xmlns='http://www.w3.org/2001/XMLSchema/moo'/>" );
Assert.assertTrue( false );
}
Modified: xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java&r1=126022&p2=xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/checkin/AssortedTests.java Sat Jan 22 00:40:28 2005
@@ -29,7 +29,7 @@
import java.math.BigInteger;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import xint.test.PositionDocument;
public class AssortedTests extends TestCase
Modified: xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java&r1=126022&p2=xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/checkin/SubstGroupTests.java Sat Jan 22 00:40:28 2005
@@ -28,7 +28,7 @@
import org.openuri.sgs.BDocument;
import org.openuri.sgs.CDocument;
import org.openuri.sgs.RootDocument;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
public class SubstGroupTests extends TestCase
{
Modified: xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java?view=diff&rev=126023&p1=xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java&r1=126022&p2=xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java&r2=126023
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java Sat Jan 22 00:40:28 2005
@@ -33,7 +33,7 @@
import org.openuri.xstypes.test.*;
import org.openuri.def.DefaultsDocument;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import javax.xml.namespace.QName;
Deleted: /xmlbeans/trunk/test/tools/lib/xsl/TestReport.xsd.jar
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/tools/lib/xsl/TestReport.xsd.jar?view=auto&rev=126022
==============================================================================
Modified: xmlbeans/trunk/testbuild.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/testbuild.xml?view=diff&rev=126023&p1=xmlbeans/trunk/testbuild.xml&r1=126022&p2=xmlbeans/trunk/testbuild.xml&r2=126023
==============================================================================
--- xmlbeans/trunk/testbuild.xml (original)
+++ xmlbeans/trunk/testbuild.xml Sat Jan 22 00:40:28 2005
@@ -183,7 +183,7 @@
<fileset refid="xbeans.build.lib"/>
<fileset refid="tools.ext.lib"/>
<!-- for building tools: TestlogMergeUtiltiy -->
- <path location="${xbeans.test.tools.lib}/xsl/TestReport.xsd.jar"/>
+ <path location="${build.dir.test.lib}/TestReport.xsd.jar"/>
<!-- Axis v1.1 .jar -->
<pathelement path="${xbeans.test.tools.lib}/axis.jar"/>
<!-- needed for the DOM w3c suite -->
@@ -492,7 +492,7 @@
<antcall target="build"/>
</target>
- <target name="build.test.tools" depends="init"
+ <target name="build.test.tools" depends="init, testreport.xsd.jar"
description="Build the tools required for tests">
<javac srcdir="${xbeans.test.tools.src}"
destdir="${build.dir.test.tools}"
@@ -508,6 +508,14 @@
<jar destfile="${build.dir.test.lib}/testtools.jar"
basedir="${build.dir.test.tools}" update="false"
excludes="**/*.java"/>
+ </target>
+
+ <target name="testreport.xsd.jar">
+ <java classname="${schema.compiler}"
+ classpathref="build.classpath"
+ fork="true">
+ <arg line="-out ${build.dir.test.lib}/TestReport.xsd.jar ${xbeans.test.tools.lib}/xsl/TestReport.xsd "/>
+ </java>
</target>
<target name="build.xpath">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org