[tomcat] branch master updated: Move the reflection generation code into the main directory

[fhanik]

This is an automated email from the ASF dual-hosted git repository.

fhanik 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 f6f65c0  Move the reflection generation code into the main directory
f6f65c0 is described below

commit f6f65c0a0d3b34f24276249a579d933b2f20cfe3
Author: Filip Hanik <fha...@pivotal.io>
AuthorDate: Thu Aug 27 09:56:16 2020 -0700

    Move the reflection generation code into the main directory
---
 build.xml                                                 | 15 ---------------
 .../xreflection/ObjectReflectionPropertyInspector.java    |  0
 .../util/xreflection/ReflectionLessCodeGenerator.java     |  0
 .../tomcat/util/xreflection/ReflectionProperty.java       |  0
 .../apache/tomcat/util/xreflection/SetPropertyClass.java  |  0
 5 files changed, 15 deletions(-)

diff --git a/build.xml b/build.xml
index 1dfa845..2001a13 100644
--- a/build.xml
+++ b/build.xml
@@ -1685,26 +1685,11 @@
     <mkdir dir="${xreflect.directory}"/>
     <copy todir="${xreflect.directory}/sources">
       <fileset dir="java"/>
-      <fileset dir="res/graal/java"/>
     </copy>
     <copy todir="${xreflect.directory}/classes">
       <fileset dir="${tomcat.classes}"/>
     </copy>
 
-    <!-- Compile the sources needed to generate XReflectionIntrospectionUtils 
-->
-    <javac includes="org/apache/tomcat/util/xreflection/*.java"
-           srcdir="${xreflect.directory}/sources"
-           destdir="${xreflect.directory}/classes"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           target="${compile.target}"
-           encoding="ISO-8859-1"
-           includeAntRuntime="true" >
-      <compilerarg value="-XDignore.symbol.file"/>
-      <classpath refid="compile.classpath" />
-    </javac>
-
     <!-- Generate the reflection less XReflectionIntrospectionUtils .java file 
-->
     <java 
classname="org.apache.tomcat.util.xreflection.ObjectReflectionPropertyInspector"
           classpath="${xreflect.directory}/classes">
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
rename to 
java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
 b/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
rename to 
java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java 
b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
rename to java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java 
b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
rename to java/org/apache/tomcat/util/xreflection/SetPropertyClass.java


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org