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 2022/01/01 23:21:41 UTC
svn commit: r1896605 - in /xmlbeans/trunk/samples: AbstractTypes/ Any/ DateTime/ MixedContent/ OrderMatters/ SampleTemplate/ SchemaEnum/ SubstitutionGroup/ Validation/ XQueryXPath/ XmlSort/ XmlTree/ XsdConfig/ vxsdb/
Author: kiwiwings
Date: Sat Jan 1 23:21:40 2022
New Revision: 1896605
URL: http://svn.apache.org/viewvc?rev=1896605&view=rev
Log:
try to fix missing javac executable on JRE JAVA_HOME path
Modified:
xmlbeans/trunk/samples/AbstractTypes/build.xml
xmlbeans/trunk/samples/Any/build.xml
xmlbeans/trunk/samples/DateTime/build.xml
xmlbeans/trunk/samples/MixedContent/build.xml
xmlbeans/trunk/samples/OrderMatters/build.xml
xmlbeans/trunk/samples/SampleTemplate/build.xml
xmlbeans/trunk/samples/SchemaEnum/build.xml
xmlbeans/trunk/samples/SubstitutionGroup/build.xml
xmlbeans/trunk/samples/Validation/build.xml
xmlbeans/trunk/samples/XQueryXPath/build.xml
xmlbeans/trunk/samples/XmlSort/build.xml
xmlbeans/trunk/samples/XmlTree/build.xml
xmlbeans/trunk/samples/XsdConfig/build.xml
xmlbeans/trunk/samples/vxsdb/build.xml
Modified: xmlbeans/trunk/samples/AbstractTypes/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/AbstractTypes/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/AbstractTypes/build.xml (original)
+++ xmlbeans/trunk/samples/AbstractTypes/build.xml Sat Jan 1 23:21:40 2022
@@ -78,12 +78,14 @@ limitations under the License.
</classpath>
</scomp>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
-
- <javac srcdir="src" destdir="build" debug="on" source="1.8" executable="${exe}">
+ <javac srcdir="src" destdir="build" debug="on" source="1.8" executable="${exe}" fork="yes">
<classpath>
<path refid="xmlbeans.path"/>
<pathelement location="build/${abstract.jar}"/>
Modified: xmlbeans/trunk/samples/Any/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/Any/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/Any/build.xml (original)
+++ xmlbeans/trunk/samples/Any/build.xml Sat Jan 1 23:21:40 2022
@@ -78,8 +78,11 @@ limitations under the License.
<mkdir dir="build/classes"/>
<mkdir dir="build/generated-sources"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac
@@ -88,6 +91,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
>
<src path="src"/>
<src path="build/generated-sources"/>
Modified: xmlbeans/trunk/samples/DateTime/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/DateTime/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/DateTime/build.xml (original)
+++ xmlbeans/trunk/samples/DateTime/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="DateTime.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/MixedContent/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/MixedContent/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/MixedContent/build.xml (original)
+++ xmlbeans/trunk/samples/MixedContent/build.xml Sat Jan 1 23:21:40 2022
@@ -77,9 +77,13 @@ limitations under the License.
<target name="MixedContent.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
</pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
+ </pathconvert>
+
<javac srcdir="src"
destdir="build/classes"
@@ -87,7 +91,8 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
- />
+ fork="yes"
+ />
</target>
<!-- ========================== run ==== -->
Modified: xmlbeans/trunk/samples/OrderMatters/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/OrderMatters/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/OrderMatters/build.xml (original)
+++ xmlbeans/trunk/samples/OrderMatters/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="OrderMatters.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/SampleTemplate/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SampleTemplate/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SampleTemplate/build.xml (original)
+++ xmlbeans/trunk/samples/SampleTemplate/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="SampleTemplate.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,7 +90,8 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
- />
+ fork="yes"
+ />
</target>
<!-- ========================== run ==== -->
Modified: xmlbeans/trunk/samples/SchemaEnum/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SchemaEnum/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SchemaEnum/build.xml (original)
+++ xmlbeans/trunk/samples/SchemaEnum/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="SchemaEnum.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/SubstitutionGroup/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/SubstitutionGroup/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/SubstitutionGroup/build.xml (original)
+++ xmlbeans/trunk/samples/SubstitutionGroup/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="SubstitutionGroup.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/Validation/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/Validation/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/Validation/build.xml (original)
+++ xmlbeans/trunk/samples/Validation/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="Validation.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
>
<src path="src"/>
<src path="build/generated-sources"/>
Modified: xmlbeans/trunk/samples/XQueryXPath/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XQueryXPath/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XQueryXPath/build.xml (original)
+++ xmlbeans/trunk/samples/XQueryXPath/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="XQueryXPath.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/XmlSort/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XmlSort/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XmlSort/build.xml (original)
+++ xmlbeans/trunk/samples/XmlSort/build.xml Sat Jan 1 23:21:40 2022
@@ -53,8 +53,11 @@ limitations under the License.
<target name="XmlSort.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -63,6 +66,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/XmlTree/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XmlTree/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XmlTree/build.xml (original)
+++ xmlbeans/trunk/samples/XmlTree/build.xml Sat Jan 1 23:21:40 2022
@@ -77,8 +77,11 @@ limitations under the License.
<target name="XmlTree.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
<javac srcdir="src"
@@ -87,6 +90,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/XsdConfig/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/XsdConfig/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/XsdConfig/build.xml (original)
+++ xmlbeans/trunk/samples/XsdConfig/build.xml Sat Jan 1 23:21:40 2022
@@ -108,16 +108,20 @@ limitations under the License.
<target name="XsdConfig.classes" depends="init">
<mkdir dir="build/classes"/>
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
- <javac srcdir="src" includes="org/apache/xmlbeans/samples/xsdconfig/CatalogXsdConfig.java org/apache/xmlbeans/samples/xsdconfig/XsdConfigTest.java"
+ <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"
executable="${exe}"
+ fork="yes"
/>
<javac srcdir="src" includes="org/apache/xmlbeans/samples/xsdconfig/CatalogXsd.java org/apache/xmlbeans/samples/xsdconfig/XsdTest.java "
destdir="build/classes"
@@ -125,6 +129,7 @@ limitations under the License.
debug="on"
source="1.8"
executable="${exe}"
+ fork="yes"
/>
</target>
Modified: xmlbeans/trunk/samples/vxsdb/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/samples/vxsdb/build.xml?rev=1896605&r1=1896604&r2=1896605&view=diff
==============================================================================
--- xmlbeans/trunk/samples/vxsdb/build.xml (original)
+++ xmlbeans/trunk/samples/vxsdb/build.xml Sat Jan 1 23:21:40 2022
@@ -25,11 +25,14 @@
</description>
<target name="build" depends="init,getdeps" description="Compile the sample code">
- <pathconvert property="exe">
- <fileset dir="${env.JAVA_HOME}" includes="bin/javac, bin/javac.exe, ../bin/javac, ../bin/javac.exe"/>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/bin" includes="javac, javac.exe"/>
+ </pathconvert>
+ <pathconvert property="exe" setonempty="false">
+ <fileset dir="${env.JAVA_HOME}/../bin" includes="javac, javac.exe"/>
</pathconvert>
- <javac srcdir="src/java" destdir="build" executable="${exe}">
+ <javac srcdir="src/java" destdir="build" executable="${exe}" fork="yes">
<classpath>
<pathelement location="lib/ant-1.6.2.jar" />
<pathelement location="lib/commons-logging-1.0.3.jar" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org