Repository: tapestry-5 Updated Branches: refs/heads/master 95a548ec4 -> 52e2b7b38
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java index 76e5b8e..76ad91e 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXAnnotationAdapter.java @@ -48,20 +48,20 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor { public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName, final int visible, final String name, final String desc) { - this(Opcodes.ASM5, sa, elementName, visible, desc, name, -1, -1, null, + this(Opcodes.ASM6, sa, elementName, visible, desc, name, -1, -1, null, null, null, null); } public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName, final int visible, final int parameter, final String desc) { - this(Opcodes.ASM5, sa, elementName, visible, desc, null, parameter, -1, + this(Opcodes.ASM6, sa, elementName, visible, desc, null, parameter, -1, null, null, null, null); } public SAXAnnotationAdapter(final SAXAdapter sa, final String elementName, final int visible, final String name, final String desc, final int typeRef, final TypePath typePath) { - this(Opcodes.ASM5, sa, elementName, visible, desc, name, -1, typeRef, + this(Opcodes.ASM6, sa, elementName, visible, desc, name, -1, typeRef, typePath, null, null, null); } @@ -69,7 +69,7 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor { final int visible, final String name, final String desc, int typeRef, TypePath typePath, final String[] start, final String[] end, final int[] index) { - this(Opcodes.ASM5, sa, elementName, visible, desc, name, -1, typeRef, + this(Opcodes.ASM6, sa, elementName, visible, desc, name, -1, typeRef, typePath, start, end, index); } @@ -113,24 +113,24 @@ public final class SAXAnnotationAdapter extends AnnotationVisitor { typePath.toString()); } if (start != null) { - StringBuffer value = new StringBuffer(start[0]); + StringBuilder value = new StringBuilder(start[0]); for (int i = 1; i < start.length; ++i) { - value.append(' ').append(start[i]); + value.append(" ").append(start[i]); } att.addAttribute("", "start", "start", "", value.toString()); } if (end != null) { - StringBuffer value = new StringBuffer(end[0]); + StringBuilder value = new StringBuilder(end[0]); for (int i = 1; i < end.length; ++i) { - value.append(' ').append(end[i]); + value.append(" ").append(end[i]); } att.addAttribute("", "end", "end", "", value.toString()); } if (index != null) { - StringBuffer value = new StringBuffer(); + StringBuilder value = new StringBuilder(); value.append(index[0]); for (int i = 1; i < index.length; ++i) { - value.append(' ').append(index[i]); + value.append(" ").append(index[i]); } att.addAttribute("", "index", "index", "", value.toString()); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java index dc4cb66..8e41508 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXClassAdapter.java @@ -33,19 +33,20 @@ import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor; import org.apache.tapestry5.internal.plastic.asm.ClassVisitor; import org.apache.tapestry5.internal.plastic.asm.FieldVisitor; import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; +import org.apache.tapestry5.internal.plastic.asm.ModuleVisitor; import org.apache.tapestry5.internal.plastic.asm.Opcodes; import org.apache.tapestry5.internal.plastic.asm.TypePath; import org.xml.sax.ContentHandler; import org.xml.sax.helpers.AttributesImpl; /** - * A {@link org.apache.tapestry5.internal.plastic.asm.ClassVisitor ClassVisitor} that generates SAX 2.0 + * A {@link org.objectweb.asm.ClassVisitor ClassVisitor} that generates SAX 2.0 * events from the visited class. It can feed any kind of * {@link org.xml.sax.ContentHandler ContentHandler}, e.g. XML serializer, XSLT * or XQuery engines. * - * @see org.apache.tapestry5.internal.plastic.asm.xml.Processor - * @see org.apache.tapestry5.internal.plastic.asm.xml.ASMContentHandler + * @see org.objectweb.asm.xml.Processor + * @see org.objectweb.asm.xml.ASMContentHandler * * @author Eugene Kuleshov */ @@ -69,6 +70,16 @@ public final class SAXClassAdapter extends ClassVisitor { * Pseudo access flag used to distinguish inner class flags. */ private static final int ACCESS_INNER = 1048576; + + /** + * Pseudo access flag used to distinguish module flags. + */ + static final int ACCESS_MODULE = 2097152; + + /** + * Pseudo access flag used to distinguish module requires flags. + */ + static final int ACCESS_MODULE_REQUIRES = 4194304; /** * Constructs a new {@link SAXClassAdapter SAXClassAdapter} object. @@ -81,7 +92,7 @@ public final class SAXClassAdapter extends ClassVisitor { * {@link ContentHandler#endDocument() endDocument()} events. */ public SAXClassAdapter(final ContentHandler h, boolean singleDocument) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); this.sa = new SAXAdapter(h); this.singleDocument = singleDocument; if (!singleDocument) { @@ -101,6 +112,21 @@ public final class SAXClassAdapter extends ClassVisitor { sa.addElement("source", att); } + + @Override + public ModuleVisitor visitModule(final String name, final int access, + final String version) { + AttributesImpl att = new AttributesImpl(); + att.addAttribute("", "name", "name", "", name); + StringBuilder sb = new StringBuilder(); + appendAccess(access | ACCESS_MODULE, sb); + att.addAttribute("", "access", "access", "", sb.toString()); + if (version != null) { + att.addAttribute("", "version", "version", "", encode(version)); + } + sa.addStart("module", att); + return new SAXModuleAdapter(sa); + } @Override public void visitOuterClass(final String owner, final String name, @@ -135,7 +161,7 @@ public final class SAXClassAdapter extends ClassVisitor { public void visit(final int version, final int access, final String name, final String signature, final String superName, final String[] interfaces) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); appendAccess(access | ACCESS_CLASS, sb); AttributesImpl att = new AttributesImpl(); @@ -170,7 +196,7 @@ public final class SAXClassAdapter extends ClassVisitor { @Override public FieldVisitor visitField(final int access, final String name, final String desc, final String signature, final Object value) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); appendAccess(access | ACCESS_FIELD, sb); AttributesImpl att = new AttributesImpl(); @@ -191,7 +217,7 @@ public final class SAXClassAdapter extends ClassVisitor { @Override public MethodVisitor visitMethod(final int access, final String name, final String desc, final String signature, final String[] exceptions) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); appendAccess(access, sb); AttributesImpl att = new AttributesImpl(); @@ -219,7 +245,7 @@ public final class SAXClassAdapter extends ClassVisitor { @Override public final void visitInnerClass(final String name, final String outerName, final String innerName, final int access) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); appendAccess(access | ACCESS_INNER, sb); AttributesImpl att = new AttributesImpl(); @@ -245,7 +271,7 @@ public final class SAXClassAdapter extends ClassVisitor { } static final String encode(final String s) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); if (c == '\\') { @@ -267,7 +293,7 @@ public final class SAXClassAdapter extends ClassVisitor { return sb.toString(); } - static void appendAccess(final int access, final StringBuffer sb) { + static void appendAccess(final int access, final StringBuilder sb) { if ((access & Opcodes.ACC_PUBLIC) != 0) { sb.append("public "); } @@ -278,14 +304,26 @@ public final class SAXClassAdapter extends ClassVisitor { sb.append("protected "); } if ((access & Opcodes.ACC_FINAL) != 0) { - sb.append("final "); + if ((access & ACCESS_MODULE) == 0) { + sb.append("final "); + } else { + sb.append("transitive "); + } } if ((access & Opcodes.ACC_STATIC) != 0) { sb.append("static "); } if ((access & Opcodes.ACC_SUPER) != 0) { if ((access & ACCESS_CLASS) == 0) { - sb.append("synchronized "); + if ((access & ACCESS_MODULE_REQUIRES) != 0) { + sb.append("transitive "); + } else { + if ((access & ACCESS_MODULE) == 0) { + sb.append("synchronized "); + } else { + sb.append("open "); + } + } } else { sb.append("super "); } @@ -294,7 +332,11 @@ public final class SAXClassAdapter extends ClassVisitor { if ((access & ACCESS_FIELD) == 0) { sb.append("bridge "); } else { - sb.append("volatile "); + if ((access & ACCESS_MODULE_REQUIRES) == 0) { + sb.append("volatile "); + } else { + sb.append("static "); + } } } if ((access & Opcodes.ACC_TRANSIENT) != 0) { @@ -329,7 +371,11 @@ public final class SAXClassAdapter extends ClassVisitor { sb.append("deprecated "); } if ((access & Opcodes.ACC_MANDATED) != 0) { - sb.append("mandated "); + if ((access & ACCESS_CLASS) == 0) { + sb.append("module "); + } else { + sb.append("mandated "); + } } } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXCodeAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXCodeAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXCodeAdapter.java index 3ed0a49..3b96007 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXCodeAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXCodeAdapter.java @@ -46,8 +46,8 @@ import org.xml.sax.helpers.AttributesImpl; * A {@link MethodVisitor} that generates SAX 2.0 events from the visited * method. * - * @see org.apache.tapestry5.internal.plastic.asm.xml.SAXClassAdapter - * @see org.apache.tapestry5.internal.plastic.asm.xml.Processor + * @see org.objectweb.asm.xml.SAXClassAdapter + * @see org.objectweb.asm.xml.Processor * * @author Eugene Kuleshov */ @@ -69,7 +69,7 @@ public final class SAXCodeAdapter extends MethodVisitor { * content handler that will be used to send SAX 2.0 events. */ public SAXCodeAdapter(final SAXAdapter sa, final int access) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); this.sa = sa; this.access = access; this.labelNames = new HashMap<Label, String>(); @@ -81,7 +81,7 @@ public final class SAXCodeAdapter extends MethodVisitor { if (name != null) { attrs.addAttribute("", "name", "name", "", name); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); SAXClassAdapter.appendAccess(access, sb); attrs.addAttribute("", "access", "access", "", sb.toString()); sa.addElement("parameter", attrs); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXFieldAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXFieldAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXFieldAdapter.java index 4fbc2a5..7f0b90e 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXFieldAdapter.java +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXFieldAdapter.java @@ -45,7 +45,7 @@ public final class SAXFieldAdapter extends FieldVisitor { SAXAdapter sa; public SAXFieldAdapter(final SAXAdapter sa, final Attributes att) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); this.sa = sa; sa.addStart("field", att); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXModuleAdapter.java ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXModuleAdapter.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXModuleAdapter.java new file mode 100644 index 0000000..39494d0 --- /dev/null +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/SAXModuleAdapter.java @@ -0,0 +1,137 @@ +/*** + * ASM XML Adapter + * Copyright (c) 2004-2011, Eugene Kuleshov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.apache.tapestry5.internal.plastic.asm.xml; + +import org.apache.tapestry5.internal.plastic.asm.ModuleVisitor; +import org.apache.tapestry5.internal.plastic.asm.Opcodes; +import org.xml.sax.helpers.AttributesImpl; + +/** + * Generate SAX event for a module description. + * + * @author Remi Forax + */ +public final class SAXModuleAdapter extends ModuleVisitor { + + private final SAXAdapter sa; + + public SAXModuleAdapter(final SAXAdapter sa) { + super(Opcodes.ASM6); + this.sa = sa; + } + + @Override + public void visitMainClass(String mainClass) { + AttributesImpl att = new AttributesImpl(); + att.addAttribute("", "name", "name", "", mainClass); + sa.addElement("main-class", att); + } + + @Override + public void visitPackage(String packaze) { + AttributesImpl att = new AttributesImpl(); + att.addAttribute("", "name", "name", "", packaze); + sa.addElement("packages", att); + } + + @Override + public void visitRequire(String module, int access, String version) { + AttributesImpl att = new AttributesImpl(); + StringBuilder sb = new StringBuilder(); + SAXClassAdapter.appendAccess(access | SAXClassAdapter.ACCESS_MODULE, sb); + att.addAttribute("", "module", "module", "", module); + att.addAttribute("", "access", "access", "", sb.toString()); + if (version != null) { + att.addAttribute("", "access", "access", "", version); + } + sa.addElement("requires", att); + } + + @Override + public void visitExport(String packaze, int access, String... modules) { + AttributesImpl att = new AttributesImpl(); + StringBuilder sb = new StringBuilder(); + SAXClassAdapter.appendAccess(access | SAXClassAdapter.ACCESS_MODULE, sb); + att.addAttribute("", "name", "name", "", packaze); + att.addAttribute("", "access", "access", "", sb.toString()); + sa.addStart("exports", att); + if (modules != null && modules.length > 0) { + for (String to : modules) { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute("", "module", "module", "", to); + sa.addElement("to", atts); + } + } + sa.addEnd("exports"); + } + + @Override + public void visitOpen(String packaze, int access, String... modules) { + AttributesImpl att = new AttributesImpl(); + StringBuilder sb = new StringBuilder(); + SAXClassAdapter.appendAccess(access | SAXClassAdapter.ACCESS_MODULE, sb); + att.addAttribute("", "name", "name", "", packaze); + att.addAttribute("", "access", "access", "", sb.toString()); + sa.addStart("opens", att); + if (modules != null && modules.length > 0) { + for (String to : modules) { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute("", "module", "module", "", to); + sa.addElement("to", atts); + } + } + sa.addEnd("opens"); + } + + @Override + public void visitUse(String service) { + AttributesImpl att = new AttributesImpl(); + att.addAttribute("", "service", "service", "", service); + sa.addElement("uses", att); + } + + @Override + public void visitProvide(String service, String... providers) { + AttributesImpl att = new AttributesImpl(); + att.addAttribute("", "service", "service", "", service); + sa.addStart("provides", att); + for (String provider : providers) { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute("", "provider", "provider", "", provider); + sa.addElement("with", atts); + } + sa.addEnd("provides"); + } + + @Override + public void visitEnd() { + sa.addEnd("module"); + } +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/asm-xml.dtd ---------------------------------------------------------------------- diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/asm-xml.dtd b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/asm-xml.dtd index b862085..b2be0d9 100644 --- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/asm-xml.dtd +++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/xml/asm-xml.dtd @@ -41,7 +41,7 @@ <!-- Root element for a single class. --> -<!ELEMENT class ( interfaces, ( field | innerclass | method )*)> +<!ELEMENT class ( interfaces, module?, ( field | innerclass | method )*)> <!ATTLIST class access CDATA #REQUIRED> <!ATTLIST class name CDATA #REQUIRED> <!ATTLIST class parent CDATA #REQUIRED> @@ -53,6 +53,20 @@ <!ELEMENT interface EMPTY> <!ATTLIST interface name CDATA #REQUIRED> +<!ELEMENT module ( requires*, exports*, uses*, provides* )> +<!ELEMENT requires EMPTY> +<!ATTLIST requires module CDATA #REQUIRED> +<!ATTLIST requires access CDATA #REQUIRED> +<!ELEMENT exports ( to* )> +<!ATTLIST exports name CDATA #REQUIRED> +<!ELEMENT to EMPTY> +<!ATTLIST to module CDATA #REQUIRED> +<!ELEMENT uses EMPTY> +<!ATTLIST uses service CDATA #REQUIRED> +<!ELEMENT provides EMPTY> +<!ATTLIST provides service CDATA #REQUIRED> +<!ATTLIST provides impl CDATA #REQUIRED> + <!ELEMENT field EMPTY> <!ATTLIST field access CDATA #REQUIRED> <!ATTLIST field desc CDATA #REQUIRED> http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74324b31/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java ---------------------------------------------------------------------- diff --git a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java index 8421b30..4c97c87 100644 --- a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java +++ b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java @@ -98,12 +98,6 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor }; } - /** - * Because of how ASM works, this should only be invoked when the array values are not - * primitives and not Class/Type; i.e. the inner values will be either Class/Type, enum, or - * nested annotations. All the arrays of strings and primitives are handled by ASM and become - * a single call to {@link #visit(String, Object)}. - */ @Override public AnnotationVisitor visitArray(final String name) { @@ -131,8 +125,12 @@ public abstract class AbstractAnnotationBuilder extends AnnotationVisitor // to Object[] if (values.size() != 0) - array = values.toArray((Object[]) array); - + { + for (int i = 0; i<values.size(); i++) + { + Array.set(array, i, values.get(i)); + } + } outerBuilder.store(name, array); } };
