You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/01/27 09:41:46 UTC
[tomcat] branch master updated: Move storage location for generated
reflectionless code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c475441 Move storage location for generated reflectionless code
c475441 is described below
commit c4754410f2cf0904940568fb33d4e7c2f87eac61
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 27 09:41:10 2021 +0000
Move storage location for generated reflectionless code
Using java.io.tmpdir was causing conflicts on CI systems when different
users run the build as the file could no be over-written
---
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 6c9bc10..455edf9 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,8 @@
<property name="tomcat.jdbc.dir" value="${basedir}/modules/jdbc-pool"/>
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
+ <!-- build output directory for generated reflectionless code -->
+ <property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
<!-- Jakarta EE 9 specs requires Java 8+ -->
<property name="compile.source" value="8"/>
@@ -1746,7 +1748,7 @@
license="${tomcat.manifests}/servlet-api.jar.license"/>
<!-- Leave generated code in an easy place for review -->
- <copy todir="${java.io.tmpdir}"
+ <copy todir="${tomcat.xreflect}"
file="${xreflect.directory}/sources/org/apache/tomcat/util/XReflectionIntrospectionUtils.java"
overwrite="true"/>
<!-- Delete our temporary compilation directory -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move storage location for
generated reflectionless code
Posted by Mark Thomas <ma...@apache.org>.
On 27/01/2021 11:28, Konstantin Kolinko wrote:
> I see that java.io.tmpdir is also used here: (line 1700)
>
> <!-- temporary directory to store the generated code -->
> <tempfile property="xreflect.directory"
> destDir="${java.io.tmpdir}" prefix="apache-tomcat-xreflect-"/>
>
> Though this use should not cause a conflict on CI, but it is odd to
> write files somewhere outside of ${tomcat.output}.
I saw that and thought about changing it but since that location is used
and then deleted and, as you say, should not cause a conflict on CI I
decided not to address it in that commit.
I have a slight preference to move it under ${tomcat.output} as you
suggest but it hasn't quite got to the point where it is bothering me
enough for me to want to do something about it.
Mark
>
> Best regards,
> Konstantin Kolinko
>
> ср, 27 янв. 2021 г. в 12:41, <ma...@apache.org>:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/master by this push:
>> new c475441 Move storage location for generated reflectionless code
>> c475441 is described below
>>
>> commit c4754410f2cf0904940568fb33d4e7c2f87eac61
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Wed Jan 27 09:41:10 2021 +0000
>>
>> Move storage location for generated reflectionless code
>>
>> Using java.io.tmpdir was causing conflicts on CI systems when different
>> users run the build as the file could no be over-written
>> ---
>> build.xml | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/build.xml b/build.xml
>> index 6c9bc10..455edf9 100644
>> --- a/build.xml
>> +++ b/build.xml
>> @@ -94,6 +94,8 @@
>> <property name="tomcat.jdbc.dir" value="${basedir}/modules/jdbc-pool"/>
>> <!-- build output directory for jdbc-pool -->
>> <property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
>> + <!-- build output directory for generated reflectionless code -->
>> + <property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
>>
>> <!-- Jakarta EE 9 specs requires Java 8+ -->
>> <property name="compile.source" value="8"/>
>> @@ -1746,7 +1748,7 @@
>> license="${tomcat.manifests}/servlet-api.jar.license"/>
>>
>> <!-- Leave generated code in an easy place for review -->
>> - <copy todir="${java.io.tmpdir}"
>> + <copy todir="${tomcat.xreflect}"
>> file="${xreflect.directory}/sources/org/apache/tomcat/util/XReflectionIntrospectionUtils.java"
>> overwrite="true"/>
>> <!-- Delete our temporary compilation directory -->
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Move storage location for
generated reflectionless code
Posted by Konstantin Kolinko <kn...@gmail.com>.
I see that java.io.tmpdir is also used here: (line 1700)
<!-- temporary directory to store the generated code -->
<tempfile property="xreflect.directory"
destDir="${java.io.tmpdir}" prefix="apache-tomcat-xreflect-"/>
Though this use should not cause a conflict on CI, but it is odd to
write files somewhere outside of ${tomcat.output}.
Best regards,
Konstantin Kolinko
ср, 27 янв. 2021 г. в 12:41, <ma...@apache.org>:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new c475441 Move storage location for generated reflectionless code
> c475441 is described below
>
> commit c4754410f2cf0904940568fb33d4e7c2f87eac61
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Wed Jan 27 09:41:10 2021 +0000
>
> Move storage location for generated reflectionless code
>
> Using java.io.tmpdir was causing conflicts on CI systems when different
> users run the build as the file could no be over-written
> ---
> build.xml | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/build.xml b/build.xml
> index 6c9bc10..455edf9 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -94,6 +94,8 @@
> <property name="tomcat.jdbc.dir" value="${basedir}/modules/jdbc-pool"/>
> <!-- build output directory for jdbc-pool -->
> <property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
> + <!-- build output directory for generated reflectionless code -->
> + <property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
>
> <!-- Jakarta EE 9 specs requires Java 8+ -->
> <property name="compile.source" value="8"/>
> @@ -1746,7 +1748,7 @@
> license="${tomcat.manifests}/servlet-api.jar.license"/>
>
> <!-- Leave generated code in an easy place for review -->
> - <copy todir="${java.io.tmpdir}"
> + <copy todir="${tomcat.xreflect}"
> file="${xreflect.directory}/sources/org/apache/tomcat/util/XReflectionIntrospectionUtils.java"
> overwrite="true"/>
> <!-- Delete our temporary compilation directory -->
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org