Author: kiwiwings
Date: Fri Dec 31 00:01:16 2021
New Revision: 1896561
URL: http://svn.apache.org/viewvc?rev=1896561&view=rev
Log:
XMLBEANS-586 - Migrate ant build to gradle
Added:
xmlbeans/trunk/build.gradle
- copied unchanged from r1896560,
xmlbeans/branches/gradle-build/build.gradle
xmlbeans/trunk/gradle/
- copied from r1896560, xmlbeans/branches/gradle-build/gradle/
xmlbeans/trunk/gradle.properties
- copied unchanged from r1896560,
xmlbeans/branches/gradle-build/gradle.properties
xmlbeans/trunk/gradlew
- copied unchanged from r1896560, xmlbeans/branches/gradle-build/gradlew
xmlbeans/trunk/gradlew.bat
- copied unchanged from r1896560,
xmlbeans/branches/gradle-build/gradlew.bat
xmlbeans/trunk/settings.gradle
- copied unchanged from r1896560,
xmlbeans/branches/gradle-build/settings.gradle
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java
- copied unchanged from r1896560,
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/SuppressForbidden.java
- copied unchanged from r1896560,
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/util/SuppressForbidden.java
xmlbeans/trunk/src/main/java9/
- copied from r1896560, xmlbeans/branches/gradle-build/src/main/java9/
xmlbeans/trunk/src/main/maven/
- copied from r1896560, xmlbeans/branches/gradle-build/src/main/maven/
xmlbeans/trunk/src/main/resources/org/
- copied from r1896560,
xmlbeans/branches/gradle-build/src/main/resources/org/
xmlbeans/trunk/src/test/java.ignore/
- copied from r1896560,
xmlbeans/branches/gradle-build/src/test/java.ignore/
xmlbeans/trunk/src/test/java/org/w3c/
- copied from r1896560,
xmlbeans/branches/gradle-build/src/test/java/org/w3c/
xmlbeans/trunk/src/test/resources/forbiddenApis/
- copied from r1896560,
xmlbeans/branches/gradle-build/src/test/resources/forbiddenApis/
Removed:
xmlbeans/trunk/samples/Any/src/org/apache/xmlbeans/samples/any/
xmlbeans/trunk/samples/Validation/src/org/apache/xmlbeans/samples/validation/todolist/
xmlbeans/trunk/samples/XQueryXPath/src/org/apache/xmlbeans/samples/xquery/employees/
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SoftCache.java
xmlbeans/trunk/src/main/multimodule/
xmlbeans/trunk/src/main/resources/maven/
xmlbeans/trunk/src/main/resources/typeimpl/
xmlbeans/trunk/src/main/resources/xmlpublic/
xmlbeans/trunk/src/test/java/drt/
xmlbeans/trunk/test/lib/
Modified:
xmlbeans/site/src/documentation/content/xdocs/status.xml
xmlbeans/trunk/ (props changed)
xmlbeans/trunk/samples/AbstractTypes/ (props changed)
xmlbeans/trunk/samples/AbstractTypes/build.xml
xmlbeans/trunk/samples/Any/ (props changed)
xmlbeans/trunk/samples/Any/build.xml
xmlbeans/trunk/samples/DateTime/build.xml
xmlbeans/trunk/samples/MixedContent/build.xml
xmlbeans/trunk/samples/OrderMatters/build.xml
xmlbeans/trunk/samples/SampleTemplate/build.xml
xmlbeans/trunk/samples/SchemaEnum/build.xml
xmlbeans/trunk/samples/SubstitutionGroup/build.xml
xmlbeans/trunk/samples/Validation/ (props changed)
xmlbeans/trunk/samples/Validation/build.xml
xmlbeans/trunk/samples/XQueryXPath/ (props changed)
xmlbeans/trunk/samples/XQueryXPath/build.xml
xmlbeans/trunk/samples/XmlSort/ (props changed)
xmlbeans/trunk/samples/XmlSort/build.xml
xmlbeans/trunk/samples/XmlTree/ (props changed)
xmlbeans/trunk/samples/XmlTree/build.xml
xmlbeans/trunk/samples/XsdConfig/ (props changed)
xmlbeans/trunk/samples/XsdConfig/build.xml
xmlbeans/trunk/samples/build.xml
xmlbeans/trunk/samples/vxsdb/ (props changed)
xmlbeans/trunk/samples/vxsdb/README.txt
xmlbeans/trunk/samples/vxsdb/build.xml
xmlbeans/trunk/samples/vxsdb/doc/NOTES.txt
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/CDataBookmark.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationSpecification.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/InterfaceExtension.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/PrePostExtension.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaBookmark.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaComponent.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaModelGroup.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaParticle.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaType.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCursor.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDocumentProperties.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlErrorCodes.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlException.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLineNumber.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptions.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlSaxHandler.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTokenSource.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlValidationError.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/Parser.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/IntStack.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/Match.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SoapEncSchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscChecker.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XmlObjectFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/DetailEntry.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/MessageFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/MimeHeader.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/MimeHeaders.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Name.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Node.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPBody.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPBodyElement.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPConnection.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPConnectionFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPEnvelope.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPException.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPFault.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPFaultElement.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPHeader.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPHeaderElement.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Text.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/FactorImports.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/MavenPluginHelp.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/TypeStore.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlObjectBase.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXPath.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
xmlbeans/trunk/src/test/java/common/Common.java
xmlbeans/trunk/src/test/java/compile/scomp/common/CompileTestBase.java
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
xmlbeans/trunk/src/test/java/compile/scomp/som/common/SomTestBase.java
xmlbeans/trunk/src/test/java/misc/checkin/RichParserTests.java
xmlbeans/trunk/src/test/java/misc/detailed/ClassLoadingTest.java
xmlbeans/trunk/src/test/java/misc/detailed/JiraRegression50_100Test.java
xmlbeans/trunk/src/test/java/misc/detailed/SampleRunner.java
xmlbeans/trunk/src/test/java/misc/detailed/SystemCacheTests.java
xmlbeans/trunk/src/test/java/random/common/Random.java
xmlbeans/trunk/src/test/java/scomp/common/BaseCase.java
xmlbeans/trunk/src/test/java/scomp/contentType/simple/detailed/ListType.java
xmlbeans/trunk/src/test/java/scomp/contentType/simple/detailed/UnionType.java
xmlbeans/trunk/src/test/java/scomp/derivation/restriction/detailed/ElementRestriction.java
xmlbeans/trunk/src/test/java/scomp/derivation/restriction/facets/detailed/ListRestriction.java
xmlbeans/trunk/src/test/java/scomp/derivation/restriction/facets/detailed/UnionRestriction.java
xmlbeans/trunk/src/test/java/scomp/elements/detailed/GlobalEltDefault.java
xmlbeans/trunk/src/test/java/scomp/elements/detailed/GlobalEltNillable.java
xmlbeans/trunk/src/test/java/scomp/redefine/detailed/AttrGroupRedefine.java
xmlbeans/trunk/src/test/java/scomp/simple/SimplePersonTest.java
xmlbeans/trunk/src/test/java/xmlcursor/xpath/common/BaseXPathTest.java
xmlbeans/trunk/src/test/java/xmlcursor/xpath/common/XPathFunctionTest.java
xmlbeans/trunk/src/test/java/xmlcursor/xpath/complex/detailed/XPathFunctionTestImpl.java
xmlbeans/trunk/src/test/java/xmlcursor/xquery/detailed/StoreTestsXqrl.java
xmlbeans/trunk/src/test/java/xmlobject/common/StringXmlReader.java
xmlbeans/trunk/src/test/java/xmlobject/extensions/interfaceFeature/averageCase/checkin/AverageTest.java
xmlbeans/trunk/src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java
xmlbeans/trunk/src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/checkin/MultInterfacesTest.java
xmlbeans/trunk/src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/checkin/ReadOnlyTest.java
xmlbeans/trunk/src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/checkin/ValueRestrictionTest.java
xmlbeans/trunk/src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/checkin/ReadOnlyTest.java
xmlbeans/trunk/src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java
xmlbeans/trunk/src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/partials/impl/RootDocumentImpl.java
xmlbeans/trunk/src/test/resources/xbean/scomp/redefine/AttrRedefineSuper.xsd
xmlbeans/trunk/xkit/doap_XMLBeans.rdf
Modified: xmlbeans/site/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/site/src/documentation/content/xdocs/status.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/site/src/documentation/content/xdocs/status.xml (original)
+++ xmlbeans/site/src/documentation/content/xdocs/status.xml Fri Dec 31
00:01:16 2021
@@ -46,6 +46,12 @@
Use a value of "true" to indicate a breakage. Otherwise, omit this
attribute.
-->
+ <release version="5.1.0" date="2022-03-??">
+ <actions>
+ <action dev="PD" type="update" context="code"
fixes-bug="XMLBEANS-586">Migrate ant build to gradle</action>
+ </actions>
+ </release>
+
<release version="5.0.3" date="2021-12-29">
<actions>
<action dev="PD" type="update" context="code"
fixes-bug="XMLBEANS-579">SampleXmlUtil misses root element with only one
child</action>
Propchange: xmlbeans/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -9,3 +9,4 @@ bin
tmp
compile-lib
lib
+.gradle
Propchange: xmlbeans/trunk/
------------------------------------------------------------------------------
Merged /xmlbeans/branches/gradle-build:r1896170-1896560
Propchange: xmlbeans/trunk/samples/AbstractTypes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/AbstractTypes/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/AbstractTypes/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/AbstractTypes/build.xml (original)
+++ xmlbeans/trunk/samples/AbstractTypes/build.xml Fri Dec 31 00:01:16 2021
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+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.
+ -->
<project name="abstracttypes" basedir="." default="build-run" >
@@ -12,29 +27,21 @@
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
-
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
- <path id="xmlbeans.classpath">
- <fileset dir="${xmlbeans.lib}"
includes="xbean.jar,xmlbeans-qname.jar,jsr173_1.0_api.jar"/>
+ <path id="xmlbeans.path">
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="scomp"
classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpathref="xmlbeans.classpath"/>
+ classpathref="xmlbeans.path"/>
</target>
<property name="abstract.jar" value="abstractbase.jar"/>
@@ -58,7 +65,7 @@
<mkdir dir="build"/>
<scomp schema="schemas/abstractBase.xsd"
destfile="build/${abstract.jar}">
<classpath>
- <path refid="xmlbeans.classpath"/>
+ <path refid="xmlbeans.path"/>
</classpath>
</scomp>
</target>
@@ -67,12 +74,12 @@
<scomp schema="schemas/myfigures.xsd"
destfile="build/${myfigures.jar}">
<classpath>
<pathelement location="build/${abstract.jar}"/>
- <path refid="xmlbeans.classpath"/>
+ <path refid="xmlbeans.path"/>
</classpath>
</scomp>
<javac srcdir="src" destdir="build" debug="on" source="1.8">
<classpath>
- <path refid="xmlbeans.classpath"/>
+ <path refid="xmlbeans.path"/>
<pathelement location="build/${abstract.jar}"/>
<pathelement location="build/${myfigures.jar}"/>
</classpath>
@@ -82,7 +89,7 @@
<target name="run" depends="build">
<java
classname="org.apache.xmlbeans.samples.abstracttypes.AbstractTypes" fork="yes">
<classpath>
- <path refid="xmlbeans.classpath"/>
+ <path refid="xmlbeans.path"/>
<pathelement location="build/${abstract.jar}"/>
<pathelement location="build/${myfigures.jar}"/>
<pathelement location="build"/>
@@ -94,7 +101,7 @@
<echo message="============================== testing AbstractTypes"/>
<java
classname="org.apache.xmlbeans.samples.abstracttypes.AbstractTypesTest"
fork="yes">
<classpath>
- <path refid="xmlbeans.classpath"/>
+ <path refid="xmlbeans.path"/>
<pathelement location="build/${abstract.jar}"/>
<pathelement location="build/${myfigures.jar}"/>
<pathelement location="build"/>
Propchange: xmlbeans/trunk/samples/Any/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/Any/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/Any/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/Any/build.xml (original)
+++ xmlbeans/trunk/samples/Any/build.xml Fri Dec 31 00:01:16 2021
@@ -26,25 +26,17 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
-
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <fail message="Set XMLBEANS_HOME in your environment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
-
+
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
@@ -76,7 +68,7 @@ limitations under the License.
<xmlbean schema="schemas"
destfile="build/lib/schemas.jar"
- srcgendir="src"
+ srcgendir="build/generated-sources"
classpathref="xmlbeans.path"
debug="on"
/>
@@ -84,13 +76,17 @@ limitations under the License.
<target name="Any.classes" depends="init">
<mkdir dir="build/classes"/>
+ <mkdir dir="build/generated-sources"/>
- <javac srcdir="src"
+ <javac
destdir="build/classes"
classpathref="Any.path"
debug="on"
source="1.8"
- />
+ >
+ <src path="src"/>
+ <src path="build/generated-sources"/>
+ </javac>
</target>
<!-- ========================== run ==== -->
Modified: xmlbeans/trunk/samples/DateTime/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/DateTime/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/DateTime/build.xml (original)
+++ xmlbeans/trunk/samples/DateTime/build.xml Fri Dec 31 00:01:16 2021
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<project name="DateTime" default="build">
<property environment="env"/>
@@ -22,29 +22,21 @@ limitations under the License.
<fileset dir="build/lib" includes="*.jar"/>
<pathelement path="build/classes"/>
</path>
-
+
<target name="init">
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
-
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
@@ -62,7 +54,7 @@ limitations under the License.
<target name="build" depends="init,schemas.jar,DateTime.classes">
</target>
-
+
<target name="schemas.check">
<uptodate property="schemas.notRequired"
targetfile="build/lib/schemas.jar">
@@ -84,15 +76,15 @@ limitations under the License.
<target name="DateTime.classes" depends="init">
<mkdir dir="build/classes"/>
-
+
<javac srcdir="src"
destdir="build/classes"
classpathref="DateTime.path"
debug="on"
source="1.8"
- />
+ />
</target>
-
+
<!-- ========================== run ==== -->
<target name="run" depends="init,build">
@@ -104,7 +96,7 @@ limitations under the License.
<arg line="xml/datetimesample.xml xml/newdatetimesample.xml"/>
</java>
</target>
-
+
<!-- ========================== test ==== -->
<target name="test" depends="init,build">
@@ -117,5 +109,5 @@ limitations under the License.
</java>
</target>
-
+
</project>
Modified: xmlbeans/trunk/samples/MixedContent/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/MixedContent/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/MixedContent/build.xml (original)
+++ xmlbeans/trunk/samples/MixedContent/build.xml Fri Dec 31 00:01:16 2021
@@ -27,24 +27,16 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Modified: xmlbeans/trunk/samples/OrderMatters/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/OrderMatters/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/OrderMatters/build.xml (original)
+++ xmlbeans/trunk/samples/OrderMatters/build.xml Fri Dec 31 00:01:16 2021
@@ -27,24 +27,16 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Modified: xmlbeans/trunk/samples/SampleTemplate/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SampleTemplate/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SampleTemplate/build.xml (original)
+++ xmlbeans/trunk/samples/SampleTemplate/build.xml Fri Dec 31 00:01:16 2021
@@ -27,24 +27,16 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Modified: xmlbeans/trunk/samples/SchemaEnum/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SchemaEnum/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SchemaEnum/build.xml (original)
+++ xmlbeans/trunk/samples/SchemaEnum/build.xml Fri Dec 31 00:01:16 2021
@@ -27,24 +27,16 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Modified: xmlbeans/trunk/samples/SubstitutionGroup/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SubstitutionGroup/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SubstitutionGroup/build.xml (original)
+++ xmlbeans/trunk/samples/SubstitutionGroup/build.xml Fri Dec 31 00:01:16 2021
@@ -27,24 +27,16 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Propchange: xmlbeans/trunk/samples/Validation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/Validation/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/Validation/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/Validation/build.xml (original)
+++ xmlbeans/trunk/samples/Validation/build.xml Fri Dec 31 00:01:16 2021
@@ -26,25 +26,17 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
-
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <fail message="Set XMLBEANS_HOME in your environment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
-
+
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
@@ -76,7 +68,7 @@ limitations under the License.
<xmlbean schema="schemas"
destfile="build/lib/schemas.jar"
- srcgendir="src"
+ srcgendir="build/generated-sources"
classpathref="xmlbeans.path"
debug="on"
/>
@@ -90,7 +82,10 @@ limitations under the License.
classpathref="Validation.path"
debug="on"
source="1.8"
- />
+ >
+ <src path="src"/>
+ <src path="build/generated-sources"/>
+ </javac>
</target>
<!-- ========================== run ==== -->
Propchange: xmlbeans/trunk/samples/XQueryXPath/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/XQueryXPath/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XQueryXPath/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XQueryXPath/build.xml (original)
+++ xmlbeans/trunk/samples/XQueryXPath/build.xml Fri Dec 31 00:01:16 2021
@@ -27,25 +27,17 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your environment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
-
+
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Propchange: xmlbeans/trunk/samples/XmlSort/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/XmlSort/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XmlSort/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XmlSort/build.xml (original)
+++ xmlbeans/trunk/samples/XmlSort/build.xml Fri Dec 31 00:01:16 2021
@@ -26,24 +26,16 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
</target>
Propchange: xmlbeans/trunk/samples/XmlTree/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/XmlTree/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XmlTree/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XmlTree/build.xml (original)
+++ xmlbeans/trunk/samples/XmlTree/build.xml Fri Dec 31 00:01:16 2021
@@ -26,25 +26,17 @@ limitations under the License.
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your environment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
-
+
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
Propchange: xmlbeans/trunk/samples/XsdConfig/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/trunk/samples/XsdConfig/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XsdConfig/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XsdConfig/build.xml (original)
+++ xmlbeans/trunk/samples/XsdConfig/build.xml Fri Dec 31 00:01:16 2021
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<project name="xsdconfig" default="build">
<property environment="env"/>
@@ -22,35 +22,27 @@ limitations under the License.
<fileset dir="build/lib" includes="schemas_xsdconfig.jar"/>
<pathelement path="build/classes"/>
</path>
-
+
<path id="Xsd.path">
<path refid="xmlbeans.path"/>
<fileset dir="build/lib" includes="schemas_xsd.jar"/>
<pathelement path="build/classes"/>
</path>
-
+
<target name="init">
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}"/>
<echo message="xmlbeans.home: ${xmlbeans.home}"/>
- <!-- check for xbean.jar from binary distribution -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/lib"
- file="${xmlbeans.home}/lib/xbean.jar" />
-
- <!-- check for xbean.jar compiled from source -->
- <available
- property="xmlbeans.lib"
- value="${xmlbeans.home}/build/lib"
- file="${xmlbeans.home}/build/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <fail message="Set XMLBEANS_HOME in your enviornment."
- unless="xmlbeans.lib"/>
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}"/>
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar"/>
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<taskdef name="xmlbean"
@@ -68,90 +60,90 @@ limitations under the License.
<target name="build" depends="init,schemas_xsd.jar,
schemas_xsdconfig.jar,XsdConfig.classes">
</target>
-
+
<target name="schemas_xsd.check">
<uptodate property="schemas_xsd.notRequired"
targetfile="build/lib/schemas_xsd.jar">
<srcfiles dir="schemas" includes="**/*.xsd"/>
</uptodate>
-
+
</target>
-
- <target name="schemas_xsdconfig.check">
+
+ <target name="schemas_xsdconfig.check">
<uptodate property="schemas_xsdconfig.notRequired"
targetfile="build/lib/schemas_xsdconfig.jar">
<srcfiles dir="schemas" includes="**/*.xsd **/*.xsdconfig"/>
</uptodate>
-
- </target>
-
- <target name="schemas_xsdconfig.jar"
depends="init,schemas_xsdconfig.check"
- unless="schemas_xsdconfig.notRequired">
+
+ </target>
+
+ <target name="schemas_xsdconfig.jar"
depends="init,schemas_xsdconfig.check"
+ unless="schemas_xsdconfig.notRequired">
<mkdir dir="build/lib"/>
-
- <!-- Generating with XSD and XsdConfig file -->
+
+ <!-- Generating with XSD and XsdConfig file -->
<xmlbean schema="schemas"
destfile="build/lib/schemas_xsdconfig.jar"
srcgendir="build/src/xsdconfig"
classpathref="xmlbeans.path"
debug="on"
- />
+ />
</target>
- <target name="schemas_xsd.jar" depends="init,schemas_xsd.check"
- unless="schemas_xsd.notRequired">
+ <target name="schemas_xsd.jar" depends="init,schemas_xsd.check"
+ unless="schemas_xsd.notRequired">
<mkdir dir="build/lib"/>
-
+
<!-- Generating with XSD only (no config file) -->
<xmlbean schema="schemas/catalog.xsd"
destfile="build/lib/schemas_xsd.jar"
srcgendir="build/src/xsd"
classpathref="xmlbeans.path"
debug="on"
- />
+ />
</target>
-
-
+
+
<target name="XsdConfig.classes" depends="init">
<mkdir dir="build/classes"/>
-
+
<javac srcdir="src"
includes="org/apache/xmlbeans/samples/xsdconfig/CatalogXsdConfig.java
org/apache/xmlbeans/samples/xsdconfig/XsdConfigTest.java"
destdir="build/classes"
classpathref="XsdConfig.path"
debug="on"
source="1.8"
- />
+ />
<javac srcdir="src"
includes="org/apache/xmlbeans/samples/xsdconfig/CatalogXsd.java
org/apache/xmlbeans/samples/xsdconfig/XsdTest.java "
destdir="build/classes"
classpathref="Xsd.path"
debug="on"
source="1.8"
- />
-
+ />
+
</target>
-
+
<!-- ========================== run ==== -->
<target name="run" depends="init,build">
- <echo message="============================== running Xsd Sample (With
XSD only - no Config)"/>
+ <echo message="============================== running Xsd Sample (With
XSD only - no Config)"/>
<java
classname="org.apache.xmlbeans.samples.xsdconfig.CatalogXsd"
classpathref="Xsd.path"
fork="true">
<arg line="xml/catalog.xml"/>
</java>
-
+
<echo message="============================== running Xsd Sample (With
XSD and XsdConfig)"/>
<java
classname="org.apache.xmlbeans.samples.xsdconfig.CatalogXsdConfig"
classpathref="XsdConfig.path"
fork="true">
<arg line="xml/catalog.xml"/>
- </java>
+ </java>
</target>
-
-
+
+
<!-- ========================== test ==== -->
<target name="test" depends="init,build">
@@ -162,7 +154,7 @@ limitations under the License.
fork="true">
<arg line="xml/catalog.xml"/>
</java>
-
+
<echo message="============================== testing XsdConfigTest"/>
<java
classname="org.apache.xmlbeans.samples.xsdconfig.XsdConfigTest"
@@ -171,5 +163,5 @@ limitations under the License.
<arg line="xml/catalog.xml"/>
</java>
</target>
-
+
</project>
Modified: xmlbeans/trunk/samples/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/build.xml (original)
+++ xmlbeans/trunk/samples/build.xml Fri Dec 31 00:01:16 2021
@@ -20,13 +20,15 @@ limitations under the License.
<target name="clean" depends="
clean-SampleTemplate,
clean-MixedContent,
+ clean-Validation,
+ clean-Any,
clean-OrderMatters,
clean-vxsdb,
clean-SchemaEnum,
clean-AbstractTypes,
clean-SubstitutionGroup,
clean-DateTime,
- clean-XsdConfig
+ clean-XsdConfig
">
<delete dir="build"/>
</target>
@@ -35,10 +37,18 @@ limitations under the License.
<ant dir="SampleTemplate" target="clean"/>
</target>
+ <target name="clean-Any">
+ <ant dir="Any" target="clean"/>
+ </target>
+
<target name="clean-MixedContent">
<ant dir="MixedContent" target="clean"/>
</target>
+ <target name="clean-Validation">
+ <ant dir="Validation" target="clean"/>
+ </target>
+
<target name="clean-OrderMatters">
<ant dir="OrderMatters" target="clean"/>
</target>
@@ -71,51 +81,61 @@ limitations under the License.
<target name="build" depends="
build-SampleTemplate,
+ build-Any,
build-MixedContent,
build-OrderMatters,
- build-vxsdb,
build-SchemaEnum,
build-AbstractTypes,
build-SubstitutionGroup,
build-DateTime,
- build-XsdConfig
+ build-Validation,
+ build-XsdConfig
">
+ <!-- build-vxsdb,-->
</target>
<target name="build-SampleTemplate">
- <ant dir="SampleTemplate" target="build"/>
+ <ant dir="SampleTemplate" target="build" inheritAll="true"/>
+ </target>
+
+ <target name="build-Any">
+ <ant dir="Any" target="build" inheritAll="true"/>
</target>
<target name="build-MixedContent">
- <ant dir="MixedContent" target="build"/>
+ <ant dir="MixedContent" target="build" inheritAll="true"/>
+ </target>
+
+ <target name="build-Validation">
+ <ant dir="Validation" target="build" inheritAll="true"/>
</target>
<target name="build-OrderMatters">
- <ant dir="OrderMatters" target="build"/>
+ <ant dir="OrderMatters" target="build" inheritAll="true"/>
</target>
<target name="build-vxsdb">
- <ant dir="vxsdb" target="build"/>
+ <ant dir="vxsdb" target="build" inheritAll="true"/>
</target>
<target name="build-SchemaEnum">
- <ant dir="SchemaEnum" target="build"/>
+ <ant dir="SchemaEnum" target="build" inheritAll="true"/>
</target>
<target name="build-AbstractTypes">
- <ant dir="AbstractTypes" target="build"/>
+ <ant dir="AbstractTypes" target="build" inheritAll="true"/>
</target>
<target name="build-SubstitutionGroup">
- <ant dir="SubstitutionGroup" target="build"/>
+ <ant dir="SubstitutionGroup" target="build" inheritAll="true"/>
</target>
<target name="build-DateTime">
- <ant dir="DateTime" target="build"/>
+ <ant dir="DateTime" target="build" inheritAll="true"/>
</target>
-
+
<target name="build-XsdConfig">
- <ant dir="XsdConfig" target="build"/>
+ <ant dir="XsdConfig" target="build" inheritAll="true"/>
</target>
<!-- ========================== test ==== -->
@@ -123,25 +143,35 @@ limitations under the License.
<target name="test" depends="
test-SampleTemplate,
+ test-Any,
test-MixedContent,
test-OrderMatters,
- test-vxsdb,
test-SchemaEnum,
test-AbstractTypes,
test-SubstitutionGroup,
test-DateTime,
- test-XsdConfig
+ test-Validation,
+ test-XsdConfig
">
+ <!-- test-vxsdb,-->
</target>
<target name="test-SampleTemplate">
<ant dir="SampleTemplate" target="test"/>
</target>
+ <target name="test-Any">
+ <ant dir="Any" target="test"/>
+ </target>
+
<target name="test-MixedContent">
<ant dir="MixedContent" target="test"/>
</target>
+ <target name="test-Validation">
+ <ant dir="Validation" target="test"/>
+ </target>
+
<target name="test-OrderMatters">
<ant dir="OrderMatters" target="test"/>
</target>
@@ -174,15 +204,18 @@ limitations under the License.
<target name="dist" depends="
dist-SampleTemplate,
+ dist-Any,
dist-MixedContent,
dist-OrderMatters,
- dist-vxsdb,
dist-SchemaEnum,
dist-AbstractTypes,
dist-SubstitutionGroup,
dist-DateTime,
- dist-XsdConfig
+ dist-Validation,
+ dist-XsdConfig
">
+ <!-- dist-vxsdb,-->
+
<zip destfile="build/samples.zip"
basedir=".."
includes="samples/**"
@@ -212,6 +245,21 @@ limitations under the License.
</target>
+ <target name="dist-Any">
+ <mkdir dir="build"/>
+ <zip destfile="build/Any.zip"
+ basedir="."
+ includes="Any/**"
+ excludes="Any/build/**"
+ />
+ <tar destfile="build/Any.tgz"
+ basedir="."
+ includes="Any/**"
+ excludes="Any/build/**"
+ compression="gzip"
+ />
+ </target>
+
<target name="dist-MixedContent">
<mkdir dir="build"/>
<zip destfile="build/MixedContent.zip"
@@ -226,6 +274,21 @@ limitations under the License.
compression="gzip"
/>
</target>
+
+ <target name="dist-Validation">
+ <mkdir dir="build"/>
+ <zip destfile="build/Validation.zip"
+ basedir="."
+ includes="Validation/**"
+ excludes="Validation/build/**"
+ />
+ <tar destfile="build/Validation.tgz"
+ basedir="."
+ includes="Validation/**"
+ excludes="Validation/build/**"
+ compression="gzip"
+ />
+ </target>
<target name="dist-OrderMatters">
<mkdir dir="build"/>
Propchange: xmlbeans/trunk/samples/vxsdb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 31 00:01:16 2021
@@ -0,0 +1,2 @@
+build
+lib
Modified: xmlbeans/trunk/samples/vxsdb/README.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/vxsdb/README.txt?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/vxsdb/README.txt (original)
+++ xmlbeans/trunk/samples/vxsdb/README.txt Fri Dec 31 00:01:16 2021
@@ -1,3 +1,18 @@
+/* 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.
+ */
+
Sample: VelocityXmlBeans
Category: sql
Author: Philip Mark Donaghy
@@ -9,9 +24,9 @@ Versions:
--------------------------------------------------------------------------------
-Vxsdb is a XmlBeans sample application which derives a Apache DB DdlUtils data
+Vxsdb is a XmlBeans sample application which derives a Apache DB DdlUtils data
model from an xml schema. It was conceived from things I have learned from
using
-XmlBeans and talking to people at the ASF conference. Vxsdb uses Jakarta
+XmlBeans and talking to people at the ASF conference. Vxsdb uses Jakarta
Velocity as its templating engine.
Features:
@@ -19,7 +34,7 @@ Features:
- Inputs a xml schema
- Outputs an Apache DB DdlUtils data model in xml
-Building this sample requires Apache dependancies which are automatically
+Building this sample requires Apache dependancies which are automatically
downloaded to the lib directory when Ant is executed.
To try out this sample:
@@ -34,7 +49,7 @@ To build this sample without downloading
-----------------------------------------------------
ant -Ddeps.exist=true
-By default run creates a ddl for the Derby RDBMS. To change the target
+By default run creates a ddl for the Derby RDBMS. To change the target
database add a directive on the command line.
Change database
Modified: xmlbeans/trunk/samples/vxsdb/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/vxsdb/build.xml?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/vxsdb/build.xml (original)
+++ xmlbeans/trunk/samples/vxsdb/build.xml Fri Dec 31 00:01:16 2021
@@ -60,17 +60,16 @@
<property name="xmlbeans.home" value="${env.XMLBEANS_HOME}" />
<echo message="xmlbeans.home: ${xmlbeans.home}" />
- <!-- check for xbean.jar from binary distribution -->
- <available property="xmlbeans.lib" value="${xmlbeans.home}/lib"
file="${xmlbeans.home}/lib/xbean.jar" />
+ <!-- check for xmlbeans-*.jar from binary distribution -->
+ <pathconvert property="xmlbeans.lib" setonempty="false" pathsep=" ">
+ <path><fileset dir="${xmlbeans.home}/libs"
includes="xmlbeans-*.jar" /></path>
+ </pathconvert>
- <!-- check for xbean.jar compiled from source -->
- <available property="xmlbeans.lib" value="${xmlbeans.home}/build/lib"
file="${xmlbeans.home}/build/lib/xbean.jar" />
-
- <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib" />
+ <fail message="Set XMLBEANS_HOME in your enviornment."
unless="xmlbeans.lib"/>
<echo message="xmlbeans.lib: ${xmlbeans.lib}" />
<path id="xmlbeans.path">
- <fileset dir="${xmlbeans.lib}" includes="*.jar" />
+ <fileset dir="${xmlbeans.home}/libs" includes="*.jar"/>
</path>
<mkdir dir="lib" />
Modified: xmlbeans/trunk/samples/vxsdb/doc/NOTES.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/samples/vxsdb/doc/NOTES.txt?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/samples/vxsdb/doc/NOTES.txt (original)
+++ xmlbeans/trunk/samples/vxsdb/doc/NOTES.txt Fri Dec 31 00:01:16 2021
@@ -1,18 +1,32 @@
-This document keeps track of issues with sql-commons, xmlbeans, or velocity
+# 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.
+
+This document keeps track of issues with sql-commons, xmlbeans, or velocity
integration in this sample.
-The easypo.xsd file implies a foreign key in the table line-item. This can
-be determined by the unbounded definition of the purchase order element. A
-better mechanism would be to include database primary and foreign key
+The easypo.xsd file implies a foreign key in the table line-item. This can
+be determined by the unbounded definition of the purchase order element. A
+better mechanism would be to include database primary and foreign key
relationships in the xml schema itself.
-Problems running the sample. Java 1.5.0 seems to be the only runtime to
+Problems running the sample. Java 1.5.0 seems to be the only runtime to
resolve the String method replace("-","_").
The run target fails with the following error:
-BUILD FAILED: /home/phil/soft/work/vxsdb/run.xml:30:
-org.apache.xmlbeans.XmlException: Thread main: The 0th supplied input is
+BUILD FAILED: /home/phil/soft/work/vxsdb/run.xml:30:
+org.apache.xmlbeans.XmlException: Thread main: The 0th supplied input is
not a schema or a config document: its type is N=
Execute a script containing the java command below if Ant is not available.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/CDataBookmark.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/CDataBookmark.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/CDataBookmark.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/CDataBookmark.java Fri Dec
31 00:01:16 2021
@@ -15,32 +15,32 @@
package org.apache.xmlbeans;
/**
- * Represents a CDATA bookmark.<p>
+ * Represents a CDATA bookmark.
* <p>
* When XmlOption UseCDataBookmarks is setted on parse methods,
* the loader will set these CDataBookmarks in the store on the respective
- * TEXT fields that were represented as CDATA.<p>
+ * TEXT fields that were represented as CDATA.
* <p>
* Users can modify the 'look' of TEXT fields, by annotating them with
- * this bookmark, or remove the bookmark.<p>
+ * this bookmark, or remove the bookmark.
* <p>
* Additionaly if setted on save methods, the output will look for these
* bookmarks and will output the text as CDATA.
* Note: The SaveCDataEntityCountThreshold and SaveCDataLengthThreshold
- * options and their default values still apply.<p>
+ * options and their default values still apply.
* <p>
* Note: Due to the store representation, a CDATA will not be recognized
* if it is imediately after non CDATA text and all text following it will
* be considered CDATA.<br>
* Example:<br>
- * <pre>
- * <a><![CDATA[cdata text]]></a> - is
considered as: <a><![CDATA[cdata text]]></a>
- * <b><![CDATA[cdata text]]> regular text</b> - is
considered as: <b><![CDATA[cdata text regular text]]></b>
- * <c>text <![CDATA[cdata text]]></c> - is
considered as: <c>text cdata text</c>
- * </pre>
+ * <pre>{@code
+ * <a><![CDATA[cdata text]]></a> - is considered as:
<a><![CDATA[cdata text]]></a>
+ * <b><![CDATA[cdata text]]> regular text</b> - is considered as:
<b><![CDATA[cdata text regular text]]></b>
+ * <c>text <![CDATA[cdata text]]></c> - is considered as: <c>text
cdata text</c>
+ * }</pre>
*
* @see XmlOptions#setUseCDataBookmarks()
- * @see org.apache.xmlbeans.XmlObject.Factory#parse(String, XmlOptions)
+ * @see org.apache.xmlbeans.impl.schema.XmlObjectFactory#parse(String,
XmlOptions)
* @see org.apache.xmlbeans.XmlObject#save(java.io.OutputStream, XmlOptions)
* @see XmlOptions#setSaveCDataEntityCountThreshold(int)
* @see XmlOptions#setSaveCDataLengthThreshold(int)
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDate.java Fri Dec 31
00:01:16 2021
@@ -774,10 +774,10 @@ public final class GDate implements GDat
/**
* Comparison to another GDate.
* <ul>
- * <li>Returns -1 if this < date. (less-than)
+ * <li>Returns -1 if this < date. (less-than)
* <li>Returns 0 if this == date. (equal)
- * <li>Returns 1 if this > date. (greater-than)
- * <li>Returns 2 if this <> date. (incomparable)
+ * <li>Returns 1 if this > date. (greater-than)
+ * <li>Returns 2 if this <> date. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java Fri Dec
31 00:01:16 2021
@@ -1184,10 +1184,10 @@ public final class GDateBuilder implemen
/**
* Comparison to another GDate.
* <ul>
- * <li>Returns -1 if this < date. (less-than)
+ * <li>Returns -1 if this < date. (less-than)
* <li>Returns 0 if this == date. (equal)
- * <li>Returns 1 if this > date. (greater-than)
- * <li>Returns 2 if this <> date. (incomparable)
+ * <li>Returns 1 if this > date. (greater-than)
+ * <li>Returns 2 if this <> date. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateSpecification.java
Fri Dec 31 00:01:16 2021
@@ -24,7 +24,7 @@ import java.util.Date;
* Both the immutable GDate and the mutable GDateBuilder are
* GDateSpecifications. Use this interface where you want to
* allow callers to pass any implementation of a GDate.
- *
+ *
* @see GDate
* @see XmlCalendar
*/
@@ -182,14 +182,14 @@ public interface GDateSpecification
/**
* Comparison to another GDate.
* <ul>
- * <li>Returns -1 if this < date. (less-than)
+ * <li>Returns -1 if this < date. (less-than)
* <li>Returns 0 if this == date. (equal)
- * <li>Returns 1 if this > date. (greater-than)
- * <li>Returns 2 if this <> date. (incomparable)
+ * <li>Returns 1 if this > date. (greater-than)
+ * <li>Returns 2 if this <> date. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
- *
+ *
* @param gdatespec the date to compare against.
*/
int compareToGDate(GDateSpecification gdatespec);
@@ -199,7 +199,7 @@ public interface GDateSpecification
* contained in this instance, or 0 if the
* instance doesn't contain information corresponding to a
* Schema type.
- * <p>
+ * <p>
* Value will be equal to
* {@link SchemaType#BTC_NOT_BUILTIN},
* {@link SchemaType#BTC_G_YEAR},
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDuration.java Fri Dec 31
00:01:16 2021
@@ -31,7 +31,7 @@ import java.math.BigDecimal;
public final class GDuration implements GDurationSpecification,
java.io.Serializable
{
private static final long serialVersionUID = 1L;
-
+
private int _sign;
private int _CY;
private int _M;
@@ -315,10 +315,10 @@ public final class GDuration implements
/**
* Comparison to another GDuration.
* <ul>
- * <li>Returns -1 if this < duration. (less-than)
+ * <li>Returns -1 if this < duration. (less-than)
* <li>Returns 0 if this == duration. (equal)
- * <li>Returns 1 if this > duration. (greater-than)
- * <li>Returns 2 if this <> duration. (incomparable)
+ * <li>Returns 1 if this > duration. (greater-than)
+ * <li>Returns 2 if this <> duration. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java Fri
Dec 31 00:01:16 2021
@@ -412,10 +412,10 @@ public class GDurationBuilder implements
/**
* Comparison to another GDuration.
* <ul>
- * <li>Returns -1 if this < duration. (less-than)
+ * <li>Returns -1 if this < duration. (less-than)
* <li>Returns 0 if this == duration. (equal)
- * <li>Returns 1 if this > duration. (greater-than)
- * <li>Returns 2 if this <> duration. (incomparable)
+ * <li>Returns 1 if this > duration. (greater-than)
+ * <li>Returns 2 if this <> duration. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationSpecification.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationSpecification.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationSpecification.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationSpecification.java
Fri Dec 31 00:01:16 2021
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
* Both the immutable GDuration and the mutable GDurationBuilder are
* GDurationSpecifications. Use this interface where you want to
* allow callers to pass any implementation of a GDuration.
- *
+ *
* @see GDuration
*/
public interface GDurationSpecification
@@ -83,10 +83,10 @@ public interface GDurationSpecification
/**
* Comparison to another GDuration.
* <ul>
- * <li>Returns -1 if this < duration. (less-than)
+ * <li>Returns -1 if this < duration. (less-than)
* <li>Returns 0 if this == duration. (equal)
- * <li>Returns 1 if this > duration. (greater-than)
- * <li>Returns 2 if this <> duration. (incomparable)
+ * <li>Returns 1 if this > duration. (greater-than)
+ * <li>Returns 2 if this <> duration. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/InterfaceExtension.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/InterfaceExtension.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/InterfaceExtension.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/InterfaceExtension.java
Fri Dec 31 00:01:16 2021
@@ -44,6 +44,9 @@ public interface InterfaceExtension
/** Returns the fully qualified type name of the parameter types in
order. */
String[] getParameterTypes();
+ /** Returns the name of the parameter */
+ String[] getParameterNames();
+
/** Returns the fully qualified type name of the exception types. */
String[] getExceptionTypes();
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/PrePostExtension.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/PrePostExtension.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/PrePostExtension.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/PrePostExtension.java Fri
Dec 31 00:01:16 2021
@@ -35,7 +35,7 @@ public interface PrePostExtension
* Returns true if the static handler class has a preSet() method
* with the following signature:
* <br>
- * <code>public static boolean preSet(int, org.apache.xmlbeans.XmlObject,
javax.xml.namespace.QName, boolean, int};</code>
+ * {@code public static boolean preSet(int, org.apache.xmlbeans.XmlObject,
javax.xml.namespace.QName, boolean, int};}
*/
boolean hasPreCall();
@@ -43,7 +43,7 @@ public interface PrePostExtension
* Returns true if the static handler class has a preSet() method
* with the following signature:
* <br>
- * <code>public static void postSet(int, org.apache.xmlbeans.XmlObject,
javax.xml.namespace.QName, boolean, int};</code>
+ * {@code public static void postSet(int, org.apache.xmlbeans.XmlObject,
javax.xml.namespace.QName, boolean, int};}
*/
boolean hasPostCall();
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java Fri
Dec 31 00:01:16 2021
@@ -16,21 +16,15 @@
package org.apache.xmlbeans;
import javax.xml.namespace.QName;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.*;
/**
* Used to build {@link QNameSet QNameSets}.
- */
+ */
public class QNameSetBuilder implements QNameSetSpecification,
java.io.Serializable
{
private static final long serialVersionUID = 1L;
-
+
private boolean _inverted;
private Set _includedURIs;
private Set _excludedQNames;
@@ -75,11 +69,11 @@ public class QNameSetBuilder implements
* Constructs a QNameSetBuilder whose inital contents are given by
* the four sets. Exactly one of either excludedURIs or includedURIs must
* be non-null.
- *
+ *
* @param excludedURIs the finite set of namespace URI strings to exclude
from the set, or null if this set is infinite
* @param includedURIs the finite set of namespace URI strings to include
in the set, or null if this set is infinite
* @param excludedQNamesInIncludedURIs the finite set of exceptional
QNames to exclude from the included namespaces
- * @param excludedQNamesInIncludedURIs the finite set of exceptional
QNames to include that are in the excluded namespaces
+ * @param includedQNamesInExcludedURIs the finite set of exceptional
QNames to include that are in the excluded namespaces
*/
public QNameSetBuilder(Set excludedURIs, Set includedURIs, Set
excludedQNamesInIncludedURIs, Set includedQNamesInExcludedURIs)
{
@@ -106,7 +100,7 @@ public class QNameSetBuilder implements
* Constructs a QNameSetBuilder whose initial contents are given
* as a list of namespace URIs, using the same format used by wildcards
* in XSD files.
- *
+ *
* @param str a wildcard namespace specification string such as "##any",
* "##other", "##local", "##targetNamespace", or a space-separated
* list of URIs.
@@ -156,7 +150,7 @@ public class QNameSetBuilder implements
addNamespace(adduri);
}
}
-
+
/**
* Local xml names are hased using "" as the namespace.
*/
@@ -165,9 +159,9 @@ public class QNameSetBuilder implements
String ns = QName.getNamespaceURI();
return ns == null ? "" : ns;
}
-
+
private static final String[] EMPTY_STRINGARRAY = new String[0];
-
+
private static boolean isSpace(char ch)
{
switch (ch)
@@ -186,7 +180,7 @@ public class QNameSetBuilder implements
{
if (s.length() == 0)
return EMPTY_STRINGARRAY;
-
+
List result = new ArrayList();
int i = 0;
int start = 0;
@@ -202,7 +196,7 @@ public class QNameSetBuilder implements
result.add(s.substring(start, i));
}
}
-
+
/**
* Remove all xml names from qnameset whose namespace matches the uri.
*/
@@ -319,7 +313,7 @@ public class QNameSetBuilder implements
{
if (!_inverted && set.excludedURIs() != null)
return false;
-
+
return inverse().isDisjoint(set);
}
@@ -679,7 +673,7 @@ public class QNameSetBuilder implements
/**
* Returns a string representation useful for debugging, subject to change.
- */
+ */
public String toString()
{
StringBuilder sb = new StringBuilder();
@@ -709,11 +703,11 @@ public class QNameSetBuilder implements
sb.append(')');
return sb.toString();
}
-
+
/**
* Returns a {@link QNameSet} equivalent to the current state of this
* QNameSetBuilder.
- */
+ */
public QNameSet toQNameSet()
{
return QNameSet.forSpecification(this);
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java
Fri Dec 31 00:01:16 2021
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
* in the logical model of a schema type system, an attribute
* group doesn't represent anything. Its contents are merged
* into the logical model at parse time.
- *
+ *
* @see SchemaTypeLoader#findAttributeGroup
*/
public interface SchemaAttributeGroup extends SchemaComponent, SchemaAnnotated
@@ -44,8 +44,6 @@ public interface SchemaAttributeGroup ex
/**
* Used to allow on-demand loading of attribute groups.
- *
- * @exclude
*/
public final static class Ref extends SchemaComponent.Ref
{
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaBookmark.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaBookmark.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaBookmark.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaBookmark.java Fri
Dec 31 00:01:16 2021
@@ -19,7 +19,7 @@ package org.apache.xmlbeans;
* Represents a Schema bookmark. The XMLSchema compiler will copy the value
* returned by {@link #getValue} when this bookmark is found in the XMLStore
* to the corresponding Schema* objects, and the value will be accessible using
- * the <code>getUserInfo</code> method on these objects.
+ * the {@code getUserInfo} method on these objects.
*
* @see SchemaType
* @see SchemaField
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaComponent.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaComponent.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaComponent.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaComponent.java Fri
Dec 31 00:01:16 2021
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
* types, element, and attributes do not appear in the global lookup table.
* Also note that other information items such as particles, facets, and
* so on are not globally indexed, so are not SchemaComponents.
- *
+ *
* @see SchemaType
* @see SchemaGlobalElement
* @see SchemaGlobalAttribute
@@ -71,8 +71,8 @@ public interface SchemaComponent
/**
* The name of resource that represends the source .xsd in which this
component was defined (if known)
- * <br/>See: {@link
org.apache.xmlbeans.SchemaTypeLoader#getSourceAsStream(String)}
- * <br/><br/>Example:<pre>
+ * <br>See: {@link
org.apache.xmlbeans.SchemaTypeLoader#getSourceAsStream(String)}
+ * <br><br>Example:<pre>
* SchemaType schemaType = ..;
* InputStream is =
schemaType.getTypeSystem().getSourceAsStream(schemaType.getSourceName());
* </pre>
@@ -82,8 +82,6 @@ public interface SchemaComponent
/**
* A lazy reference to a component. Used by SchemaTypeLoaders to
* avoid loading components until they are actually needed.
- *
- * @exclude
*/
public static abstract class Ref
{
@@ -119,9 +117,9 @@ public interface SchemaComponent
return _schemaComponent;
}
}
-
+
/**
* Used for on-demand loading of schema components.
- */
+ */
public Ref getComponentRef();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java
Fri Dec 31 00:01:16 2021
@@ -17,15 +17,13 @@ package org.apache.xmlbeans;
/**
* Represents a global attribute definition
- *
+ *
* @see SchemaTypeLoader#findAttribute
- */
+ */
public interface SchemaGlobalAttribute extends SchemaLocalAttribute,
SchemaComponent
{
/**
* Used to allow on-demand loading of elements.
- *
- * @exclude
*/
public final static class Ref extends SchemaComponent.Ref
{
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java
Fri Dec 31 00:01:16 2021
@@ -19,7 +19,7 @@ import javax.xml.namespace.QName;
/**
* Represents a global element definition.
- *
+ *
* @see SchemaTypeLoader#findElement
*/
public interface SchemaGlobalElement extends SchemaLocalElement,
SchemaComponent
@@ -33,7 +33,7 @@ public interface SchemaGlobalElement ext
/**
* The element that is the head of this element's substitution
- * group, or <code>null</code> if this element is not a member
+ * group, or {@code null} if this element is not a member
* of a substitution group.
*/
SchemaGlobalElement substitutionGroup();
@@ -58,8 +58,6 @@ public interface SchemaGlobalElement ext
/**
* Used to allow on-demand loading of elements.
- *
- * @exclude
*/
public final static class Ref extends SchemaComponent.Ref
{
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaModelGroup.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaModelGroup.java?rev=1896561&r1=1896560&r2=1896561&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaModelGroup.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaModelGroup.java Fri
Dec 31 00:01:16 2021
@@ -42,8 +42,6 @@ public interface SchemaModelGroup extend
/**
* Used to allow on-demand loading of model groups.
- *
- * @exclude
*/
public final static class Ref extends SchemaComponent.Ref
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
