You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/12/27 20:28:41 UTC
svn commit: r1896456 [1/14] - in /xmlbeans/branches/gradle-build: ./ gradle/ gradle/wrapper/ samples/ samples/AbstractTypes/ samples/Any/ samples/DateTime/ samples/MixedContent/ samples/OrderMatters/ samples/SampleTemplate/ samples/SchemaEnum/ samples/...
Author: kiwiwings
Date: Mon Dec 27 20:28:38 2021
New Revision: 1896456
URL: http://svn.apache.org/viewvc?rev=1896456&view=rev
Log:
Gradle migration
Fix InterfaceExtension delegation
Import W3C dom tests
Added:
xmlbeans/branches/gradle-build/build.gradle
xmlbeans/branches/gradle-build/gradle/
xmlbeans/branches/gradle-build/gradle.properties
- copied, changed from r1896166, poi/trunk/gradle.properties
xmlbeans/branches/gradle-build/gradle/wrapper/
xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.jar (with props)
xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties
xmlbeans/branches/gradle-build/settings.gradle
- copied, changed from r1896166, poi/trunk/settings.gradle
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/config/ChildSolverCollectionStrategy.java
xmlbeans/branches/gradle-build/src/main/java9/
- copied from r1896455, xmlbeans/branches/gradle-build/src/main/multimodule/java9/
xmlbeans/branches/gradle-build/src/main/maven/
- copied from r1896455, xmlbeans/branches/gradle-build/src/main/resources/maven/
xmlbeans/branches/gradle-build/src/main/resources/org/
- copied from r1896455, xmlbeans/branches/gradle-build/src/main/resources/typeimpl/org/
xmlbeans/branches/gradle-build/src/main/resources/org/apache/xmlbeans/message.properties
- copied unchanged from r1896455, xmlbeans/branches/gradle-build/src/main/resources/xmlpublic/org/apache/xmlbeans/message.properties
xmlbeans/branches/gradle-build/src/test/java.ignore/
xmlbeans/branches/gradle-build/src/test/java.ignore/drt/
- copied from r1896455, xmlbeans/branches/gradle-build/src/test/java/drt/
xmlbeans/branches/gradle-build/src/test/java/org/w3c/
xmlbeans/branches/gradle-build/src/test/java/org/w3c/LICENSE.txt
- copied, changed from r1896455, xmlbeans/branches/gradle-build/test/lib/LICENSE.txt
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/DOMTest.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/DOMTestCase.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/DOMTestFramework.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/DOMTestLoadException.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/XBeanFramework.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/attrgetownerelement01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/attrgetownerelement02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/attrgetownerelement03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/attrgetownerelement04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/attrgetownerelement05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createAttributeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createAttributeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createAttributeNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createAttributeNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createAttributeNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocument07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocumentType01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocumentType02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createDocumentType03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createElementNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createElementNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createElementNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createElementNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/createElementNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentcreateelementNS06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentgetelementbyid01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentgetelementsbytagnameNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode10.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode11.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode12.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode13.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode14.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode15.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode17.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode18.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode19.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode20.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode21.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documentimportnode22.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documenttypeinternalSubset01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documenttypepublicid01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/documenttypesystemid01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocument07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationcreatedocumenttype04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturecore.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationfeaturexmlversion2.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/domimplementationhasfeature02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetattributenodens03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetattributens02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementgetelementsbytagnamens05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattribute01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattribute02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattribute03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattribute04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattributens01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattributens02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementhasattributens03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementremoveattributens01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributenodens06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributens01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributens02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributens03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributens04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributens05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributens08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/elementsetattributensurinull.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getAttributeNodeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementById01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementById02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS10.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS11.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS12.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS13.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getElementsByTagNameNS14.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getNamedItemNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getNamedItemNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getNamedItemNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/getNamedItemNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttribute01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttribute02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttribute03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttribute04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributeNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributeNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributeNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributes01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hasAttributes02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_attrcreatedocumentfragment.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_attrname.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_documentcreateattribute.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_elementgetattributenode.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_entitiesremovenameditemns1.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_entitiessetnameditemns1.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_namednodemapgetnameditem.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_nodedocumentfragmentnormalize1.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_nodedocumentfragmentnormalize2.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_notationsremovenameditemns1.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/hc_notationssetnameditemns1.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode10.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode11.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode12.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode13.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode14.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode15.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode16.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/importNode17.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/internalSubset01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported10.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported11.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported12.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported13.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/isSupported14.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/localName01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/localName02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/localName03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/localName04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapgetnameditemns01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapgetnameditemns02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapgetnameditemns03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapgetnameditemns04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapgetnameditemns05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapgetnameditemns06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapremovenameditemns09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns10.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namednodemapsetnameditemns11.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namespaceURI01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namespaceURI02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namespaceURI03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/namespaceURI04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetlocalname03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetnamespaceuri03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetownerdocument02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodegetprefix03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodehasattributes04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodeissupported05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodenormalize01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/nodesetprefix09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/normalize01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerDocument01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/ownerElement02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix08.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix10.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/prefix11.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/publicId01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeAttributeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/removeNamedItemNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS06.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS07.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNS09.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setAttributeNodeNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS01.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS02.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS03.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS04.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/setNamedItemNS05.java
xmlbeans/branches/gradle-build/src/test/java/org/w3c/domts/level2/core/systemId01.java
xmlbeans/branches/gradle-build/src/test/java/scomp/xmlbeans583/
- copied from r1896455, xmlbeans/trunk/src/test/java/scomp/xmlbeans583/
xmlbeans/branches/gradle-build/src/test/resources/xbean/scomp/xmlbeans-583/
- copied from r1896455, xmlbeans/trunk/src/test/resources/xbean/scomp/xmlbeans-583/
Removed:
xmlbeans/branches/gradle-build/src/main/multimodule/
xmlbeans/branches/gradle-build/src/main/resources/maven/
xmlbeans/branches/gradle-build/src/main/resources/typeimpl/
xmlbeans/branches/gradle-build/src/main/resources/xmlpublic/
xmlbeans/branches/gradle-build/src/test/java/drt/
xmlbeans/branches/gradle-build/test/lib/
Modified:
xmlbeans/branches/gradle-build/ (props changed)
xmlbeans/branches/gradle-build/build.xml
xmlbeans/branches/gradle-build/samples/AbstractTypes/ (props changed)
xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml
xmlbeans/branches/gradle-build/samples/Any/build.xml
xmlbeans/branches/gradle-build/samples/DateTime/build.xml
xmlbeans/branches/gradle-build/samples/MixedContent/build.xml
xmlbeans/branches/gradle-build/samples/OrderMatters/build.xml
xmlbeans/branches/gradle-build/samples/SampleTemplate/build.xml
xmlbeans/branches/gradle-build/samples/SchemaEnum/build.xml
xmlbeans/branches/gradle-build/samples/SubstitutionGroup/build.xml
xmlbeans/branches/gradle-build/samples/Validation/build.xml
xmlbeans/branches/gradle-build/samples/XQueryXPath/build.xml
xmlbeans/branches/gradle-build/samples/XmlSort/build.xml
xmlbeans/branches/gradle-build/samples/XmlTree/build.xml
xmlbeans/branches/gradle-build/samples/XsdConfig/ (props changed)
xmlbeans/branches/gradle-build/samples/XsdConfig/build.xml
xmlbeans/branches/gradle-build/samples/build.xml
xmlbeans/branches/gradle-build/samples/vxsdb/ (props changed)
xmlbeans/branches/gradle-build/samples/vxsdb/build.xml
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/InterfaceExtension.java
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/config/Parser.java
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
xmlbeans/branches/gradle-build/src/main/java9/module-info.class
xmlbeans/branches/gradle-build/src/test/java/common/Common.java
xmlbeans/branches/gradle-build/src/test/java/compile/scomp/common/CompileTestBase.java
xmlbeans/branches/gradle-build/src/test/java/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
xmlbeans/branches/gradle-build/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
xmlbeans/branches/gradle-build/src/test/java/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
xmlbeans/branches/gradle-build/src/test/java/misc/checkin/RichParserTests.java
xmlbeans/branches/gradle-build/src/test/java/misc/detailed/JiraRegression50_100Test.java
xmlbeans/branches/gradle-build/src/test/java/misc/detailed/SampleRunner.java
xmlbeans/branches/gradle-build/src/test/java/scomp/common/BaseCase.java
xmlbeans/branches/gradle-build/src/test/java/scomp/contentType/simple/detailed/ListType.java
xmlbeans/branches/gradle-build/src/test/java/scomp/contentType/simple/detailed/UnionType.java
xmlbeans/branches/gradle-build/src/test/java/scomp/derivation/restriction/detailed/ElementRestriction.java
xmlbeans/branches/gradle-build/src/test/java/scomp/derivation/restriction/facets/detailed/ListRestriction.java
xmlbeans/branches/gradle-build/src/test/java/scomp/derivation/restriction/facets/detailed/UnionRestriction.java
xmlbeans/branches/gradle-build/src/test/java/scomp/elements/detailed/GlobalEltNillable.java
xmlbeans/branches/gradle-build/src/test/java/xmlobject/extensions/interfaceFeature/averageCase/checkin/AverageTest.java
xmlbeans/branches/gradle-build/src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java
xmlbeans/branches/gradle-build/src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/checkin/MultInterfacesTest.java
xmlbeans/branches/gradle-build/src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/checkin/ReadOnlyTest.java
xmlbeans/branches/gradle-build/src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/checkin/ValueRestrictionTest.java
xmlbeans/branches/gradle-build/src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/checkin/ReadOnlyTest.java
xmlbeans/branches/gradle-build/src/test/resources/xbean/compile/scomp/partials/impl/RootDocumentImpl.java
Propchange: xmlbeans/branches/gradle-build/
------------------------------------------------------------------------------
Merged /xmlbeans/branches/gradle-build:r1896171-1896455
Merged /xmlbeans/trunk:r1896171-1896455
Added: xmlbeans/branches/gradle-build/build.gradle
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/build.gradle?rev=1896456&view=auto
==============================================================================
--- xmlbeans/branches/gradle-build/build.gradle (added)
+++ xmlbeans/branches/gradle-build/build.gradle Mon Dec 27 20:28:38 2021
@@ -0,0 +1,349 @@
+plugins {
+ id 'java'
+ id 'java-library'
+ id 'idea'
+}
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+repositories {
+ mavenCentral()
+ maven {
+ url 'https://repository.apache.org/content/repositories/releases'
+ }
+ maven {
+ url 'https://repository.apache.org/content/repositories/staging'
+ }
+}
+
+configurations {
+ bootstrap
+ genresources
+ java9
+}
+
+def testSchemas = [
+ [dir:'test/tools/lib',path:'xsl',name:'sTOOLS'],
+ [dir:'src/test/resources/xbean/compile/scomp',path:'detailed',name:'sLAX'],
+ [dir:'src/test/resources/xbean',path:'dom',name:'sDOM'],
+ [dir:'src/test/resources/xbean',path:'xmlcursor',name:'sXMLCURSOR'],
+ [dir:'src/test/resources/xbean',path:'scomp',name:'sSCOMP'],
+ [dir:'src/test/resources/xbean',path:'simple',name:'sSIMPLE'],
+ [dir:'src/test/resources/xbean',path:'ValidatingStream',name:'sVALIDATE'],
+ [dir:'src/test/resources/xbean',path:'usertype',name:'sUSERTYPE'],
+ [dir:'build/schemas/sTRANXML',path:'tranxml',name:'sTRANXML'],
+ [dir:'src/test/resources/xbean/xmlobject',path:'CR192525.xsd defaults.xsd easypo.xsd easypo.xsdconfig enumtest.xsd enumtest.xsdconfig inttest.xsd listandunion.xsd nameworld.xsd numerals.xsd redefine2.xsd SelectAttribute.xsd SelectChildren.xsd selectChldAttTest.xsd soap-envelope.xsd soapfaults.xsd substgroup.xsd substgroup2.xsd Test.xsd Test36510.xsd Test40907.xsd version3.xsd', name:'sXMLOBJECT'],
+ [dir:'src/test/resources/xbean/misc/jira',path:'xmlbeans_33b.xsd xmlbeans_46.xsd xmlbeans_48.xsd xmlbeans_64.xsd xmlbeans_68.xsd xmlbeans_71.xsd xmlbeans_98.xsd xmlbeans_99.xsd xmlbeans_105.xsd xmlbeans_175.xsd xmlbeans_177.xsd xmlbeans_177a.xsd xmlbeans_208.xsd xmlbeans_228.xsd xmlbeans_307_maxallowedenum.xsd xmlbeans_307_morethanallowedenum.xsd', name:'sJIRA' ],
+ [dir:'src/test/resources/xbean',path:'xmltokensource',name:'sTOKENSOURCE']
+] + xsdDirs(file('src/test/resources/xbean/extensions')).withIndex().collect { element, index ->
+ // the extensions need to be generated separately, because the *.xsdconfigs have overlapping definitions
+ [dir:'src/test/resources/xbean/extensions',path:element,name:"sEXT${index}"]
+}
+
+//
+
+sourceSets {
+ main {
+ java {
+ srcDir files('build/generated/sources/base/main/java').builtBy('base_SchemaGen')
+ }
+ resources {
+ srcDir files('build/generated/sources/base/main/resources').builtBy('base_SchemaGen')
+ }
+ }
+ test {
+ java {
+ testSchemas.each {
+ srcDir files("build/generated/sources/${it.name}/test/java").builtBy("${it.name}_SchemaGen")
+ }
+ }
+ resources {
+ testSchemas.each {
+ srcDir files("build/generated/sources/${it.name}/test/resources").builtBy("${it.name}_SchemaGen")
+ }
+ }
+ }
+}
+
+dependencies {
+
+ implementation 'org.apache.logging.log4j:log4j-api:2.17.0'
+ implementation 'net.sf.saxon:Saxon-HE:10.6'
+ implementation 'org.apache.ant:ant:1.10.12'
+ implementation 'com.github.javaparser:javaparser-core:3.23.1'
+ implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.23.1'
+
+ // only for java 8
+ if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+ implementation 'xml-apis:xml-apis:1.4.01'
+ }
+ // only necessary to compile against JDK8 internals - for Java9+ there's a multimodule implementation
+ implementation 'com.sun.org.apache.xml.internal:resolver:20050927'
+
+ testImplementation 'junit:junit:4.13.2'
+ testImplementation 'org.apache.logging.log4j:log4j-core:2.17.0'
+ testImplementation 'org.apache.ant:ant-junit:1.10.12'
+ testImplementation 'org.apache.ant:ant-junit4:1.10.12'
+ testImplementation 'org.hamcrest:hamcrest:2.2'
+ testImplementation('xerces:xercesImpl:2.12.1') {
+ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+ exclude group: 'xml-apis', module: 'xml-apis'
+ }
+ }
+ // Currently a lot of w3c tests fail
+ testImplementation files('test/lib/w3c_domts.jar')
+
+ // maven plugin dependencies
+ implementation('org.apache.maven:maven-core:3.8.4')
+ implementation 'org.apache.maven:maven-model:3.8.4'
+ implementation('org.apache.maven:maven-plugin-api:3.8.4')
+ implementation 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.2'
+
+
+ // previous xmlbeans version is used to bootstrap necessary schema bindings
+ bootstrap 'org.apache.xmlbeans:xmlbeans:5.0.2'
+ bootstrap 'org.apache.logging.log4j:log4j-core:2.17.0'
+
+ genresources 'org.apache.logging.log4j:log4j-core:2.17.0'
+ genresources project.files('build/generated/classes/bootstrap/main')
+ genresources project.files('build/generated/sources/bootstrap/main/resources')
+ genresources project.files('src/main/resources')
+ genresources 'com.github.javaparser:javaparser-core:3.23.1'
+ genresources 'com.github.javaparser:javaparser-symbol-solver-core:3.23.1'
+
+ // need an own configuration for Java9 builds, as the maven plugin module-config is overlapping lot
+ java9 'org.apache.logging.log4j:log4j-api:2.17.0'
+ java9 'net.sf.saxon:Saxon-HE:10.6'
+ java9 'org.apache.ant:ant:1.10.12'
+ java9 'com.github.javaparser:javaparser-core:3.23.1'
+ java9('com.github.javaparser:javaparser-symbol-solver-core:3.23.1') {
+ exclude group: 'com.google.guava', module: 'guava'
+ }
+
+}
+
+wrapper {
+ // https://stackoverflow.com/a/54741656/2066598
+ gradleVersion = '7.3.3'
+}
+
+def extCP = files(configurations.testCompileClasspath + sourceSets.main.output.files + sourceSets.main.resources.srcDirs)
+testSchemas.each {
+ schemaGenTask(it.name, 'test', (it.name =~ /sEXT/ ? extCP : configurations.genresources), it.dir, "${it.path}:${it.name}")
+}
+
+task adjustWrapperPropertiesFile {
+ doLast {
+ ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) {
+ fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties')
+ }
+ new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') }
+ ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf')
+ }
+}
+wrapper.finalizedBy adjustWrapperPropertiesFile
+
+// https://discuss.gradle.org/t/passing-arguments-to-a-task/8427
+def schemaGenTask(String baseName, String mainTest, FileCollection beansPath, String xsdDir, String... xsdIncludes) {
+ String srcDir = "build/generated/sources/${baseName}/${mainTest}/java"
+ String rscDir = "build/generated/sources/${baseName}/${mainTest}/resources"
+
+ Map<String,String> map = xsdIncludes.collectEntries{it.split(':')}
+
+ return tasks.create("${baseName}_SchemaGen") {
+
+ FileTree inputFiles = fileTree(dir: xsdDir, includes: map.keySet().collect{ it.split(' ')}.flatten())
+
+ it.inputs.files(inputFiles)
+ it.outputs.dir(srcDir)
+ it.outputs.dir(rscDir)
+ it.outputs.cacheIf { true }
+
+ doLast {
+ ant.mkdir(dir:srcDir)
+ ant.mkdir(dir:rscDir)
+
+ // https://www.reddit.com/r/gradle/comments/aaqofp/extend_javaexec_task_with_additional/
+ map.each {xmlEntry ->
+ javaexec {
+ classpath beansPath
+ mainClass = "org.apache.xmlbeans.impl.tool.SchemaCompiler"
+ jvmArgs "-ea"
+ args = [ "-name", xmlEntry.value, "-quiet", "-srconly", "-noann", "-d", rscDir, "-src", srcDir ] + xmlEntry.key.split(' ').collect{"${xsdDir}/${it}"}
+ if (baseName =~ /sEXT/) {
+ args += ['src/test/java/xmlobject/extensions']
+ }
+ if (baseName =~ /sUSERTYPE/) {
+// debugOptions {
+// enabled = true
+// port = 5006
+// server = true
+// suspend = true
+// }
+ }
+ }
+ }
+ }
+ }
+}
+
+
+schemaGenTask('bootstrap', 'main', configurations.bootstrap, 'src/main/schema', 'xml:sXMLLANG','xsd:sXMLSCHEMA','config:sXMLCONFIG','tools:sXMLTOOLS')
+task bootstrapMigrate(type: JavaCompile) {
+ dependsOn 'bootstrap_SchemaGen'
+ source files('build/generated/sources/bootstrap/main/java', 'src/main/java')
+ destinationDirectory = layout.buildDirectory.dir('generated/classes/bootstrap/main')
+ classpath = configurations.compileClasspath
+ outputs.cacheIf { true }
+}
+
+// base_SchemaGen
+schemaGenTask('base', 'main', configurations.genresources, 'src/main/schema', 'xml:sXMLLANG','xsd:sXMLSCHEMA','config:sXMLCONFIG','tools:sXMLTOOLS')
+base_SchemaGen.dependsOn 'bootstrapMigrate'
+
+task unpackTranXml(type: Copy) {
+ from tarTree(resources.bzip2('src/test/resources/xbean/tranxml.tar.bz2'))
+ into 'build/schemas/sTRANXML/tranxml'
+ include 'tranxml/Version4.0/schemas/StandAlone/CarLocationMessage_40_LX.xsd'
+ includeEmptyDirs = false
+ eachFile { path = name }
+ outputs.cacheIf { true }
+}
+
+sTRANXML_SchemaGen.dependsOn 'unpackTranXml'
+
+compileTestJava {
+ dependsOn 'jar'
+ dependsOn testSchemas.collect {"${it.name}_SchemaGen" }
+}
+
+task compileJava9(type: JavaCompile) {
+ dependsOn 'compileJava'
+ onlyIf { JavaVersion.current() != JavaVersion.VERSION_1_8 }
+
+ sourceCompatibility = 9
+ targetCompatibility = 9
+ destinationDirectory = file('build/classes/java9/main/META-INF/versions/9')
+ source = file('src/main/java9')
+ classpath = files()
+ options.compilerArgs = [
+ '--patch-module', "org.apache.xmlbeans=${sourceSets.main.output.asPath}",
+ '--module-path', files(sourceSets.main.output.files + configurations.java9.asFileTree.files).asPath
+ ]
+}
+
+task cacheJava9(type: Copy) {
+ dependsOn 'compileJava9'
+ onlyIf { JavaVersion.current() != JavaVersion.VERSION_1_8 }
+
+ from(file('build/classes/java9/main/META-INF/versions/9'))
+ into('src/main/java9')
+}
+
+
+
+processTestResources {
+ duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+task export4anttest(type: Copy) {
+ dependsOn 'jar'
+ into "build/libs"
+ from configurations.java9
+}
+
+test {
+ dependsOn 'export4anttest'
+
+ useJUnit()
+
+ // the w3c_domts.jar is scanned by junit. Up till now, only the test referenced in the ibmtests class were used
+ // now we need to disable a few failing ones
+ filter {
+ excludeTest('org.w3c.domts.level2.core.getElementsByTagNameNS08', null)
+ excludeTest('org.w3c.domts.level2.core.hasAttribute02', null)
+ excludeTest('org.w3c.domts.level2.core.hc_attrcreatedocumentfragment', null)
+ excludeTest('org.w3c.domts.level2.core.importNode07', null)
+ excludeTest('org.w3c.domts.level2.core.localName03', null)
+ excludeTest('org.w3c.domts.level2.core.nodegetnamespaceuri03', null)
+ excludeTest('org.w3c.domts.level2.core.nodegetprefix03', null)
+ excludeTest('org.w3c.domts.level2.core.nodesetprefix05', null)
+ excludeTest('org.w3c.domts.level2.core.prefix02', null)
+ excludeTest('org.w3c.domts.level2.core.prefix04', null)
+ excludeTest('org.w3c.domts.level2.core.prefix07', null)
+ excludeTest('org.w3c.domts.level2.core.removeNamedItemNS03', null)
+ excludeTest('org.w3c.domts.level2.core.documentimportnode03', null)
+ excludeTest('org.w3c.domts.level2.core.documentimportnode08', null)
+ excludeTest('org.w3c.domts.level2.core.domimplementationcreatedocumenttype02', null)
+ excludeTest('org.w3c.domts.level2.core.domimplementationcreatedocumenttype04', null)
+ excludeTest('org.w3c.domts.level2.core.elementgetattributenodens03', null)
+ excludeTest('org.w3c.domts.level2.core.elementgetattributens02', null)
+ excludeTest('org.w3c.domts.level2.core.elementhasattribute02', null)
+ excludeTest('org.w3c.domts.level2.core.elementsetattributenodens06', null)
+ excludeTest('org.w3c.domts.level2.core.namednodemapgetnameditemns01', null)
+ excludeTest('org.w3c.domts.level2.core.namednodemapremovenameditemns02', null)
+ excludeTest('org.w3c.domts.level2.core.namednodemapremovenameditemns05', null)
+ excludeTest('org.w3c.domts.level2.core.namednodemapsetnameditemns05', null)
+ excludeTest('org.w3c.domts.level2.core.namednodemapsetnameditemns09', null)
+ excludeTest('org.w3c.domts.level2.core.namednodemapsetnameditemns10', null)
+ excludeTest('org.w3c.domts.level2.core.nodegetnamespaceuri03', null)
+ excludeTest('org.w3c.domts.level2.core.nodegetownerdocument01', null)
+ excludeTest('org.w3c.domts.level2.core.nodegetprefix03', null)
+ excludeTest('org.w3c.domts.level2.core.nodehasattributes02', null)
+ excludeTest('org.w3c.domts.level2.core.nodeissupported03', null)
+ excludeTest('org.w3c.domts.level2.core.nodeissupported04', null)
+ excludeTest('org.w3c.domts.level2.core.nodesetprefix04', null)
+ excludeTest('org.w3c.domts.level2.core.nodesetprefix05', null)
+ }
+}
+
+idea {
+ module {
+ generatedSourceDirs += file('build/generated/sources/base/main/java')
+ generatedSourceDirs += files( testSchemas.collect {"build/generated/sources/${it.name}/test/java" } )
+ // setting those has no effect and there's no generatedResourceDirs
+ generatedSourceDirs += file('build/generated/sources/base/main/resources')
+ generatedSourceDirs += files( testSchemas.collect {"build/generated/sources/${it.name}/test/resources" } )
+ }
+}
+
+jar {
+ dependsOn 'cacheJava9'
+
+ from(project.rootDir) {
+ include 'NOTICE.txt'
+ include 'LICENSE.txt'
+ into 'META-INF'
+ }
+
+ from('src/main/java9') {
+ exclude '**/*.java'
+ into 'META-INF'
+ }
+
+ duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
+ manifest {
+ attributes('Multi-Release':'true')
+ attributes([
+ 'Comment': "Apache XmlBeans version ${project.version}",
+ 'Specification-Title': 'Apache XmlBeans',
+ 'Specification-Version': project.version,
+ 'Specification-Vendor': 'The Apache Software Foundation',
+ 'Implementation-Title': 'Apache XmlBeans',
+ 'Implementation-Version': project.version,
+ 'Implementation-Vendor': 'org.apache.xmlbeans',
+ 'Implementation-Vendor-Id': 'The Apache Software Foundation'
+ ], 'org/apache/xmlbeans/'
+ )
+ }
+}
+
+Set<File> xsdDirs(File parent) {
+ Set<File> xsdDirs = [] as Set<File>
+ parent.eachDirRecurse {dirIt ->
+ dirIt.eachFileMatch(groovy.io.FileType.FILES, ~/.*\.xsd.*/, { xsdDirs << parent.toPath().relativize(dirIt.toPath()).toFile() })
+ }
+ return xsdDirs
+}
Modified: xmlbeans/branches/gradle-build/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/build.xml (original)
+++ xmlbeans/branches/gradle-build/build.xml Mon Dec 27 20:28:38 2021
@@ -21,7 +21,7 @@
<property name="jdk.version.class" value="1.8" description="JDK version of generated class files"/>
<property name="compile.debug" value="true"/>
- <property name="version.base" value="5.0.3-SNAPSHOT"/>
+ <property name="version.base" value="5.0.3"/>
<property name="version.rc" value=""/>
<property name="cases.location" location="src/test/resources"/>
Copied: xmlbeans/branches/gradle-build/gradle.properties (from r1896166, poi/trunk/gradle.properties)
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/gradle.properties?p2=xmlbeans/branches/gradle-build/gradle.properties&p1=poi/trunk/gradle.properties&r1=1896166&r2=1896456&rev=1896456&view=diff
==============================================================================
--- poi/trunk/gradle.properties (original)
+++ xmlbeans/branches/gradle-build/gradle.properties Mon Dec 27 20:28:38 2021
@@ -1,3 +1,5 @@
+version=5.0.4-SNAPSHOT
+
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Less than 2G definitely slows things down. -XX:+HeapDumpOnOutOfMemoryError
@@ -5,7 +7,7 @@ org.gradle.jvmargs=-Xmx2G -Dfile.encodin
# Activating will be much faster, but break the build of 'poi-ooxml-lite'
# @todo: look into poi-ooxml-lite task generateModuleInfo and enforce running whatever is needed before
-org.gradle.caching=false
+org.gradle.caching=true
# Modularise your project and enable parallel build
org.gradle.parallel=true
Added: xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.jar?rev=1896456&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties?rev=1896456&view=auto
==============================================================================
--- xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties (added)
+++ xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties Mon Dec 27 20:28:38 2021
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
Propchange: xmlbeans/branches/gradle-build/samples/AbstractTypes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 27 20:28:38 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml Mon Dec 27 20:28:38 2021
@@ -12,29 +12,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 +50,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 +59,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 +74,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 +86,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"/>
Modified: xmlbeans/branches/gradle-build/samples/Any/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/Any/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/Any/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/Any/build.xml Mon Dec 27 20:28:38 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"
Modified: xmlbeans/branches/gradle-build/samples/DateTime/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/DateTime/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/DateTime/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/DateTime/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/MixedContent/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/MixedContent/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/MixedContent/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/MixedContent/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/OrderMatters/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/OrderMatters/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/OrderMatters/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/OrderMatters/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/SampleTemplate/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/SampleTemplate/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/SampleTemplate/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/SampleTemplate/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/SchemaEnum/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/SchemaEnum/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/SchemaEnum/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/SchemaEnum/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/SubstitutionGroup/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/SubstitutionGroup/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/SubstitutionGroup/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/SubstitutionGroup/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/Validation/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/Validation/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/Validation/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/Validation/build.xml Mon Dec 27 20:28:38 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"
Modified: xmlbeans/branches/gradle-build/samples/XQueryXPath/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/XQueryXPath/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/XQueryXPath/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/XQueryXPath/build.xml Mon Dec 27 20:28:38 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"
Modified: xmlbeans/branches/gradle-build/samples/XmlSort/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/XmlSort/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/XmlSort/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/XmlSort/build.xml Mon Dec 27 20:28:38 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>
Modified: xmlbeans/branches/gradle-build/samples/XmlTree/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/XmlTree/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/XmlTree/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/XmlTree/build.xml Mon Dec 27 20:28:38 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/branches/gradle-build/samples/XsdConfig/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 27 20:28:38 2021
@@ -0,0 +1 @@
+build
Modified: xmlbeans/branches/gradle-build/samples/XsdConfig/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/XsdConfig/build.xml?rev=1896456&r1=1896455&r2=1896456&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/XsdConfig/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/XsdConfig/build.xml Mon Dec 27 20:28:38 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org