Author: markt
Date: Mon Feb 13 20:39:14 2017
New Revision: 1782857
URL: http://svn.apache.org/viewvc?rev=1782857&view=rev
Log:
Java 9 support for annotation scanning
Based on:
http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html#jigsaw-2.6
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/Const.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 13 20:39:14 2017
@@ -1,3 +1,3 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1757132
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1782855
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1747272
/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Const.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Const.java?rev=1782857&r1=1782856&r2=1782857&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Const.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Const.java Mon Feb 13
20:39:14 2017
@@ -114,6 +114,18 @@ public final class Const {
* The Constant Pool in The Java Virtual Machine Specification</a> */
public static final byte CONSTANT_InvokeDynamic = 18;
+ /** Marks a constant pool entry as a Module Reference.
+ * @see <a
href="http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html#jigsaw-2.6";>
+ * JPMS: Modules in the Java Language and JVM</a>
+ * Note: Early access Java 9 support- currently subject to change */
+ public static final byte CONSTANT_Module = 19;
+
+ /** Marks a constant pool entry as a Package Reference.
+ * @see <a
href="http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html#jigsaw-2.6";>
+ * JPMS: Modules in the Java Language and JVM</a>
+ * Note: Early access Java 9 support- currently subject to change */
+ public static final byte CONSTANT_Package = 20;
+
/**
* The names of the types of entries in a constant pool.
* Use getConstantName instead
@@ -124,7 +136,8 @@ public final class Const {
"CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
"CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
"CONSTANT_NameAndType", "", "", "CONSTANT_MethodHandle",
- "CONSTANT_MethodType", "", "CONSTANT_InvokeDynamic" };
+ "CONSTANT_MethodType", "", "CONSTANT_InvokeDynamic",
+ "CONSTANT_Module", "CONSTANT_Package"};
public static String getConstantName(int index) {
return CONSTANT_NAMES[index];
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1782857&r1=1782856&r2=1782857&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Mon
Feb 13 20:39:14 2017
@@ -81,6 +81,8 @@ public abstract class Constant {
return ConstantUtf8.getInstance(input);
case Const.CONSTANT_String:
case Const.CONSTANT_MethodType:
+ case Const.CONSTANT_Module:
+ case Const.CONSTANT_Package:
skipSize = 2; // unsigned short
break;
case Const.CONSTANT_MethodHandle:
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1782857&r1=1782856&r2=1782857&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 13 20:39:14 2017
@@ -75,6 +75,11 @@
on some JVMs. (coty)
</fix>
<fix>
+ <bug>60688</bug>: Update the internal fork of Apache Commons BCEL to
+ r1782855 to add early access Java 9 support to the annotation scanning
+ code. (markt)
+ </fix>
+ <fix>
<bug>60720</bug>: Replace "WWW-Authenticate" literal with static final
AUTH_HEADER_NAME in SpnegoAuthenticator. Patch provided by Michael
Osipov. (violetagg)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
