diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
tree | c44943ee0563a3fa957716de909fed683117fcb9 /dev-java/tomcat-servlet-api/files | |
parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'dev-java/tomcat-servlet-api/files')
4 files changed, 20 insertions, 278 deletions
diff --git a/dev-java/tomcat-servlet-api/files/3.0-build.xml b/dev-java/tomcat-servlet-api/files/3.0-build.xml deleted file mode 100644 index c685394d83f9..000000000000 --- a/dev-java/tomcat-servlet-api/files/3.0-build.xml +++ /dev/null @@ -1,92 +0,0 @@ -<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir="."> - - <property name="compile.source" value="1.5"/> - - <property name="tomcat.build" value="${basedir}/output/build"/> - <property name="tomcat.classes" value="${basedir}/output/classes"/> - <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> - <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> - <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> - - <!-- Just build Tomcat --> - <target name="build-prepare"> - - <available classname="junit.framework.TestCase" property="junit.present" /> - - <mkdir dir="${tomcat.build}"/> - <mkdir dir="${tomcat.build}/lib"/> - <mkdir dir="${tomcat.classes}"/> - - </target> - - <target name="compile"> - - <!-- Compile internal server components --> - <javac srcdir="java" destdir="${tomcat.classes}" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - source="${compile.source}" - optimize="${compile.optimize}" - excludes="**/CVS/**,**/.svn/**"> - <exclude name="java/javax/annotation/**" /> - <exclude name="java/javax/ejb/**" /> - <exclude name="java/javax/mail/**" /> - <exclude name="java/javax/persistence/**" /> - <exclude name="java/javax/xml/**" /> - <exclude name="org/**" /> - </javac> - <tstamp> - <format property="TODAY" pattern="MMM d yyyy" locale="en"/> - <format property="TSTAMP" pattern="hh:mm:ss"/> - </tstamp> - <!-- Copy static resource files --> - <filter token="VERSION" value="${version}"/> - <filter token="VERSION_NUMBER" value="${version.number}"/> - <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/> - <copy todir="${tomcat.classes}" filtering="true"> - <fileset dir="java"> - <include name="**/*.properties"/> - <include name="**/*.dtd"/> - <include name="**/*.tasks"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - </fileset> - </copy> - - </target> - - <target name="jar" depends="build-prepare,compile"> - <!-- Servlet 3.0 Implementation JAR File --> - <jar jarfile="${servlet-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/*" /> - <include name="javax/servlet/annotation/*" /> - <include name="javax/servlet/descriptor/*" /> - <include name="javax/servlet/http/*" /> - <include name="javax/servlet/resources/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.2 Implementation JAR File --> - <jar jarfile="${jsp-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/jsp/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.2 EL Implementation JAR File --> - <jar jarfile="${el-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/el/**" /> - </fileset> - </jar> - - </target> - -</project> diff --git a/dev-java/tomcat-servlet-api/files/3.1-build.xml b/dev-java/tomcat-servlet-api/files/3.1-build.xml deleted file mode 100644 index ea0ef877570d..000000000000 --- a/dev-java/tomcat-servlet-api/files/3.1-build.xml +++ /dev/null @@ -1,93 +0,0 @@ - -<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir="."> - - <property name="compile.source" value="1.7"/> - - <property name="tomcat.build" value="${basedir}/output/build"/> - <property name="tomcat.classes" value="${basedir}/output/classes"/> - <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> - <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> - <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> - - <!-- Just build Tomcat --> - <target name="build-prepare"> - - <available classname="junit.framework.TestCase" property="junit.present" /> - - <mkdir dir="${tomcat.build}"/> - <mkdir dir="${tomcat.build}/lib"/> - <mkdir dir="${tomcat.classes}"/> - - </target> - - <target name="compile"> - - <!-- Compile internal server components --> - <javac srcdir="java" destdir="${tomcat.classes}" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - source="${compile.source}" - optimize="${compile.optimize}" - excludes="**/CVS/**,**/.svn/**"> - <exclude name="java/javax/annotation/**" /> - <exclude name="java/javax/ejb/**" /> - <exclude name="java/javax/mail/**" /> - <exclude name="java/javax/persistence/**" /> - <exclude name="java/javax/xml/**" /> - <exclude name="org/**" /> - </javac> - <tstamp> - <format property="TODAY" pattern="MMM d yyyy" locale="en"/> - <format property="TSTAMP" pattern="hh:mm:ss"/> - </tstamp> - <!-- Copy static resource files --> - <filter token="VERSION" value="${version}"/> - <filter token="VERSION_NUMBER" value="${version.number}"/> - <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/> - <copy todir="${tomcat.classes}" filtering="true"> - <fileset dir="java"> - <include name="**/*.properties"/> - <include name="**/*.dtd"/> - <include name="**/*.tasks"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - </fileset> - </copy> - - </target> - - <target name="jar" depends="build-prepare,compile"> - <!-- Servlet 3.1 Implementation JAR File --> - <jar jarfile="${servlet-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/*" /> - <include name="javax/servlet/annotation/*" /> - <include name="javax/servlet/descriptor/*" /> - <include name="javax/servlet/http/*" /> - <include name="javax/servlet/resources/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.3 Implementation JAR File --> - <jar jarfile="${jsp-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/jsp/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.3 EL Implementation JAR File --> - <jar jarfile="${el-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/el/**" /> - </fileset> - </jar> - - </target> - -</project> diff --git a/dev-java/tomcat-servlet-api/files/4.0-build.xml b/dev-java/tomcat-servlet-api/files/4.0-build.xml deleted file mode 100644 index ea0ef877570d..000000000000 --- a/dev-java/tomcat-servlet-api/files/4.0-build.xml +++ /dev/null @@ -1,93 +0,0 @@ - -<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir="."> - - <property name="compile.source" value="1.7"/> - - <property name="tomcat.build" value="${basedir}/output/build"/> - <property name="tomcat.classes" value="${basedir}/output/classes"/> - <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> - <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> - <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> - - <!-- Just build Tomcat --> - <target name="build-prepare"> - - <available classname="junit.framework.TestCase" property="junit.present" /> - - <mkdir dir="${tomcat.build}"/> - <mkdir dir="${tomcat.build}/lib"/> - <mkdir dir="${tomcat.classes}"/> - - </target> - - <target name="compile"> - - <!-- Compile internal server components --> - <javac srcdir="java" destdir="${tomcat.classes}" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - source="${compile.source}" - optimize="${compile.optimize}" - excludes="**/CVS/**,**/.svn/**"> - <exclude name="java/javax/annotation/**" /> - <exclude name="java/javax/ejb/**" /> - <exclude name="java/javax/mail/**" /> - <exclude name="java/javax/persistence/**" /> - <exclude name="java/javax/xml/**" /> - <exclude name="org/**" /> - </javac> - <tstamp> - <format property="TODAY" pattern="MMM d yyyy" locale="en"/> - <format property="TSTAMP" pattern="hh:mm:ss"/> - </tstamp> - <!-- Copy static resource files --> - <filter token="VERSION" value="${version}"/> - <filter token="VERSION_NUMBER" value="${version.number}"/> - <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/> - <copy todir="${tomcat.classes}" filtering="true"> - <fileset dir="java"> - <include name="**/*.properties"/> - <include name="**/*.dtd"/> - <include name="**/*.tasks"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - </fileset> - </copy> - - </target> - - <target name="jar" depends="build-prepare,compile"> - <!-- Servlet 3.1 Implementation JAR File --> - <jar jarfile="${servlet-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/*" /> - <include name="javax/servlet/annotation/*" /> - <include name="javax/servlet/descriptor/*" /> - <include name="javax/servlet/http/*" /> - <include name="javax/servlet/resources/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.3 Implementation JAR File --> - <jar jarfile="${jsp-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/servlet/jsp/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - - <!-- JSP 2.3 EL Implementation JAR File --> - <jar jarfile="${el-api.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="javax/el/**" /> - </fileset> - </jar> - - </target> - -</project> diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch new file mode 100644 index 000000000000..7dffca69ce67 --- /dev/null +++ b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch @@ -0,0 +1,20 @@ +diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java +index 2f42de7..5d52580 100644 +--- a/java/jakarta/el/ExpressionFactory.java ++++ b/java/jakarta/el/ExpressionFactory.java +@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock; + import java.util.concurrent.locks.ReadWriteLock; + import java.util.concurrent.locks.ReentrantReadWriteLock; + +-import aQute.bnd.annotation.spi.ServiceConsumer; ++//import aQute.bnd.annotation.spi.ServiceConsumer; + + /** + * + * @since 2.1 + */ +-@ServiceConsumer(value=ExpressionFactory.class) ++//@ServiceConsumer(value=ExpressionFactory.class) + public abstract class ExpressionFactory { + + private static final boolean IS_SECURITY_ENABLED = |