Author: kiwiwings
Date: Wed Dec 29 16:13:26 2021
New Revision: 1896509
URL: http://svn.apache.org/viewvc?rev=1896509&view=rev
Log:
add rat check and fix headers
Removed:
xmlbeans/branches/gradle-build/samples/Any/src/org/apache/xmlbeans/samples/any/
xmlbeans/branches/gradle-build/samples/Validation/src/org/apache/xmlbeans/samples/validation/todolist/
xmlbeans/branches/gradle-build/samples/XQueryXPath/src/org/apache/xmlbeans/samples/xquery/employees/
Modified:
xmlbeans/branches/gradle-build/build.gradle
xmlbeans/branches/gradle-build/gradle.properties
xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties
xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml
xmlbeans/branches/gradle-build/samples/Any/build.xml
xmlbeans/branches/gradle-build/samples/Validation/build.xml
xmlbeans/branches/gradle-build/samples/build.xml
xmlbeans/branches/gradle-build/samples/vxsdb/README.txt
xmlbeans/branches/gradle-build/samples/vxsdb/doc/NOTES.txt
xmlbeans/branches/gradle-build/settings.gradle
xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf
Modified: xmlbeans/branches/gradle-build/build.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/build.gradle?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/build.gradle (original)
+++ xmlbeans/branches/gradle-build/build.gradle Wed Dec 29 16:13:26 2021
@@ -1,8 +1,26 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+==================================================================== */
+
plugins {
id 'java'
id 'java-library'
id 'idea'
id 'distribution'
+ id('org.nosphere.apache.rat') version '0.7.0'
}
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -235,8 +253,6 @@ javadoc {
}
}
-check.dependsOn 'javadoc'
-
compileTestJava {
dependsOn 'jar'
dependsOn testSchemas.collect {"${it.name}_SchemaGen" }
@@ -326,6 +342,39 @@ jar {
}
}
+rat {
+ excludes = [
+ 'tmp',
+ 'out',
+ 'build',
+ '.gradle',
+ '.idea',
+ 'src/test/java/org/w3c/**',
+ 'samples/*/build',
+ 'test/perf',
+ 'test/docs',
+ '**/*.iml',
+ '**/XML.xsd',
+ '**/XMLSchema.xsd',
+ '**/zvon*.xml',
+ '**/xmldsig-core-schema.xsd',
+ 'src/test/resources/xbean/xmlobject/japanese',
+ 'src/test/resources/xbean/compile/scomp/j2ee',
+ 'src/test/resources/xbean/dom/W3C/level2/core/files',
+ 'src/test/resources/xbean/xmlobject/soap-envelope.xsd',
+ 'src/test/resources/xbean/xmlobject/soap12-encoding.xsd',
+ 'src/test/resources/xbean/compile/scomp/partials',
+ 'src/test/resources/xbean/dom/W3C/level2',
+ 'xbeanenv.*',
+ 'CHANGES.txt',
+ 'SECURITY.md',
+ '.travis.yml'
+ ]
+
+ // Prints the list of files with unapproved licences to the console,
defaults to false
+ verbose = true
+}
+
distributions {
// dependsOn 'jar'
@@ -367,6 +416,19 @@ distributions {
}
}
+task jenkins() {
+ dependsOn 'check'
+ dependsOn 'javadoc'
+ dependsOn 'rat'
+ dependsOn 'binDistZip'
+}
+
+clean {
+ ant.delete(includeemptydirs:true) {
+ fileset(dir:"samples", includes:"*/build/**")
+ }
+}
+
Set<File> xsdDirs(File parent) {
Set<File> xsdDirs = [] as Set<File>
parent.eachDirRecurse {dirIt ->
Modified: xmlbeans/branches/gradle-build/gradle.properties
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/gradle.properties?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/gradle.properties (original)
+++ xmlbeans/branches/gradle-build/gradle.properties Wed Dec 29 16:13:26 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.
+
+
# comment-out, because of naming problems with the distribution plugin
# project.version=5.0.4-SNAPSHOT
XMLBeansVersion=5.0.4-SNAPSHOT
Modified:
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=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties
(original)
+++ xmlbeans/branches/gradle-build/gradle/wrapper/gradle-wrapper.properties Wed
Dec 29 16:13:26 2021
@@ -1,3 +1,17 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
Modified: xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/AbstractTypes/build.xml Wed Dec 29
16:13:26 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" >
Modified: xmlbeans/branches/gradle-build/samples/Any/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/Any/build.xml?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/Any/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/Any/build.xml Wed Dec 29 16:13:26
2021
@@ -68,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"
/>
@@ -76,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/branches/gradle-build/samples/Validation/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/Validation/build.xml?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/Validation/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/Validation/build.xml Wed Dec 29
16:13:26 2021
@@ -68,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"
/>
@@ -82,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 ==== -->
Modified: xmlbeans/branches/gradle-build/samples/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/build.xml?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/build.xml (original)
+++ xmlbeans/branches/gradle-build/samples/build.xml Wed Dec 29 16:13:26 2021
@@ -20,6 +20,8 @@ limitations under the License.
<target name="clean" depends="
clean-SampleTemplate,
clean-MixedContent,
+ clean-Validation,
+ clean-Any,
clean-OrderMatters,
clean-vxsdb,
clean-SchemaEnum,
@@ -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,12 +81,14 @@ limitations under the License.
<target name="build" depends="
build-SampleTemplate,
+ build-Any,
build-MixedContent,
build-OrderMatters,
build-SchemaEnum,
build-AbstractTypes,
build-SubstitutionGroup,
build-DateTime,
+ build-Validation,
build-XsdConfig
">
<!-- build-vxsdb,-->
@@ -86,10 +98,18 @@ limitations under the License.
<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" inheritAll="true"/>
</target>
+ <target name="build-Validation">
+ <ant dir="Validation" target="build" inheritAll="true"/>
+ </target>
+
<target name="build-OrderMatters">
<ant dir="OrderMatters" target="build" inheritAll="true"/>
</target>
@@ -123,12 +143,14 @@ limitations under the License.
<target name="test" depends="
test-SampleTemplate,
+ test-Any,
test-MixedContent,
test-OrderMatters,
test-SchemaEnum,
test-AbstractTypes,
test-SubstitutionGroup,
test-DateTime,
+ test-Validation,
test-XsdConfig
">
<!-- test-vxsdb,-->
@@ -138,10 +160,18 @@ limitations under the License.
<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,13 +204,15 @@ limitations under the License.
<target name="dist" depends="
dist-SampleTemplate,
+ dist-Any,
dist-MixedContent,
dist-OrderMatters,
dist-SchemaEnum,
dist-AbstractTypes,
dist-SubstitutionGroup,
dist-DateTime,
- dist-XsdConfig
+ dist-Validation,
+ dist-XsdConfig
">
<!-- dist-vxsdb,-->
@@ -213,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"
@@ -227,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"/>
Modified: xmlbeans/branches/gradle-build/samples/vxsdb/README.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/vxsdb/README.txt?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/vxsdb/README.txt (original)
+++ xmlbeans/branches/gradle-build/samples/vxsdb/README.txt Wed Dec 29 16:13:26
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/branches/gradle-build/samples/vxsdb/doc/NOTES.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/samples/vxsdb/doc/NOTES.txt?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/samples/vxsdb/doc/NOTES.txt (original)
+++ xmlbeans/branches/gradle-build/samples/vxsdb/doc/NOTES.txt Wed Dec 29
16:13:26 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/branches/gradle-build/settings.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/settings.gradle?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/settings.gradle (original)
+++ xmlbeans/branches/gradle-build/settings.gradle Wed Dec 29 16:13:26 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.
+ */
+
rootProject.name = 'xmlbeans'
//include 'poi', 'poi-ooxml-full', 'poi-ooxml-lite-agent', 'poi-scratchpad',
Modified: xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf
URL:
http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf?rev=1896509&r1=1896508&r2=1896509&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf (original)
+++ xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf Wed Dec 29 16:13:26
2021
@@ -1,5 +1,22 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
+
+<!--
+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.
+ -->
+
<rdf:RDF xml:lang="en"
xmlns="http://usefulinc.com/ns/doap#";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
