diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 4d78c4359..a70fd01c6 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -32,7 +32,7 @@ jobs:
strategy:
matrix:
java: [ '8', '11', '17', '21' ]
- os: [ macos-10.15 ]
+ os: [ macos-13 ]
steps:
- uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
index 897174462..57bb5cea0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/target/
*.orig
*/nb-configuration.xml
+*/dependency-reduced-pom.xml
*/nbactions.xml
/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle*/build/*
/html4j-maven-plugin/src/test/resources/org/netbeans/html/mojo/gradle*/.gradle/*
diff --git a/boot-agent-test/pom.xml b/boot-agent-test/pom.xml
index 54c4e4a4a..188742a37 100644
--- a/boot-agent-test/pom.xml
+++ b/boot-agent-test/pom.xml
@@ -28,7 +28,7 @@
boot-agent-testjar
- Dynamic Boot Test
+ Agent Boot Test${skipJavaFXTests}
@@ -48,6 +48,23 @@
true
+
+ maven-dependency-plugin
+
+
+
+ properties
+
+
+
+
+
+ maven-surefire-plugin
+ 3.2.5
+
+ -javaagent:${org.netbeans.html:net.java.html.boot:jar}
+
+
@@ -70,27 +87,19 @@
testjar
-
- org.netbeans.api
- org-openide-util-lookup
- test
- jar
- ${project.groupId}
- net.java.html.boot.fx
+ net.java.html.boot.script${project.version}test
- org.openjfx
- javafx-web
- test
+ org.graalvm.js
+ js
- org.ow2.asm
- asm
- test
+ org.graalvm.js
+ js-scriptengine
\ No newline at end of file
diff --git a/boot-agent-test/src/test/java/org/netbeans/html/bootagent/AgentBootstrapTest.java b/boot-agent-test/src/test/java/org/netbeans/html/bootagent/AgentBootstrapTest.java
new file mode 100644
index 000000000..7854566d5
--- /dev/null
+++ b/boot-agent-test/src/test/java/org/netbeans/html/bootagent/AgentBootstrapTest.java
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.html.bootagent;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import net.java.html.boot.script.Scripts;
+import static org.testng.AssertJUnit.assertNotNull;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach
+ */
+public class AgentBootstrapTest {
+ public AgentBootstrapTest() {
+ }
+
+ @Factory
+ public static Object[] compatibilityTests() throws Exception {
+ var presenter = Scripts.newPresenter().build();
+ assertNotNull("Presenter has been initialized", presenter);
+
+ var res = new ArrayList
diff --git a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
index 0071cdd90..2b39d661b 100644
--- a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
@@ -21,6 +21,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -62,6 +64,21 @@ private FnUtils() {
* @since 0.7
*/
public static byte[] transform(byte[] bytecode, ClassLoader loader) {
+ return transform(bytecode, loader, false);
+ }
+ /** Seeks for {@link JavaScriptBody} and {@link JavaScriptResource} annotations
+ * in the bytecode and converts them into real code. Used by Maven plugin
+ * postprocessing classes.
+ *
+ * @param bytecode the original bytecode with javascript specific annotations
+ * @param loader the loader to load resources (scripts and classes) when needed
+ * @param makeVisible {@code true} if the {@link Retention} of the
+ * {@link JavaScriptBody} and {@link JavaScriptResource} annotations
+ * should be changed to {@link RetentionPolicy#RUNTIME}
+ * @return the transformed bytecode
+ * @since 1.8.2
+ */
+ public static byte[] transform(byte[] bytecode, ClassLoader loader, boolean makeVisible) {
ClassReader cr = new ClassReader(bytecode) {
// to allow us to compile with -profile compact1 on
// JDK8 while processing the class as JDK7, the highest
@@ -75,11 +92,11 @@ public short readShort(int index) {
return s;
}
};
- FindInClass tst = new FindInClass(loader, null);
+ FindInClass tst = new FindInClass(loader, null, makeVisible);
cr.accept(tst, 0);
if (tst.found > 0) {
ClassWriter w = new ClassWriterEx(loader, cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
- FindInClass fic = new FindInClass(loader, w);
+ FindInClass fic = new FindInClass(loader, w, makeVisible);
cr.accept(fic, 0);
bytecode = w.toByteArray();
}
@@ -119,9 +136,11 @@ private static final class FindInClass extends ClassVisitor {
private int found;
private int resourcesCnt = 0;
private final String[] resources = new String[256];
+ private final boolean makeVisible;
- public FindInClass(ClassLoader l, ClassVisitor cv) {
+ FindInClass(ClassLoader l, ClassVisitor cv, boolean makeVisible) {
super(Opcodes.ASM5, cv);
+ this.makeVisible = makeVisible;
}
@Override
@@ -133,11 +152,16 @@ public void visit(int version, int access, String name, String signature, String
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
final AnnotationVisitor del = super.visitAnnotation(desc, visible);
+ if ("Ljava/lang/annotation/Retention;".equals(desc)) {
+ return makeVisible ? new RetentionChange(del) : del;
+ }
if ("Lnet/java/html/js/JavaScriptResource;".equals(desc)) {
- return new LoadResource(del);
+ var visibleDel = makeVisible ? super.visitAnnotation(desc, true) : null;
+ return new LoadResource(DoubleVisitor.combine(del, visibleDel));
}
if ("Lnet/java/html/js/JavaScriptResource$Group;".equals(desc)) {
- return new LoadResource(del);
+ var visibleDel = makeVisible ? super.visitAnnotation(desc, true) : null;
+ return new LoadResource(DoubleVisitor.combine(del, visibleDel));
}
return del;
}
@@ -179,8 +203,9 @@ public FindInMethod(int access, String name, String desc, MethodVisitor mv) {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
if ("Lnet/java/html/js/JavaScriptBody;".equals(desc)) { // NOI18N
+ var visibleDel = makeVisible ? super.visitAnnotation(desc, true) : null;
found++;
- return new FindInAnno();
+ return DoubleVisitor.combine(new FindInAnno(), visibleDel);
}
return super.visitAnnotation(desc, visible);
}
@@ -504,7 +529,7 @@ private final class FindInAnno extends AnnotationVisitor {
Boolean wait4java;
Boolean keepAlive;
- public FindInAnno() {
+ FindInAnno() {
super(Opcodes.ASM5);
}
@@ -564,8 +589,60 @@ boolean keepAlive() {
}
}
+ private static final class DoubleVisitor extends AnnotationVisitor {
+ private final AnnotationVisitor a2;
+
+ private DoubleVisitor(AnnotationVisitor a1, AnnotationVisitor a2) {
+ super(Opcodes.ASM5, a1);
+ assert a2 != null;
+ this.a2 = a2;
+ }
+
+ static AnnotationVisitor combine(AnnotationVisitor a1, AnnotationVisitor a2) {
+ if (a1 == null) {
+ return a2;
+ } else if (a2 == null) {
+ return a1;
+ } else {
+ return new DoubleVisitor(a1, a2);
+ }
+ }
+
+ @Override
+ public void visitEnd() {
+ super.visitEnd();
+ a2.visitEnd();
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(String name) {
+ var v1 = super.visitArray(name);
+ var v2 = a2.visitArray(name);
+ return DoubleVisitor.combine(v1, v2);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ var v1 = super.visitAnnotation(name, desc);
+ var v2 = a2.visitAnnotation(name, desc);
+ return DoubleVisitor.combine(v1, v2);
+ }
+
+ @Override
+ public void visitEnum(String name, String desc, String value) {
+ super.visitEnum(name, desc, value);
+ a2.visitEnum(name, desc, value);
+ }
+
+ @Override
+ public void visit(String name, Object value) {
+ super.visit(name, value);
+ a2.visit(name, value);
+ }
+ }
+
private final class LoadResource extends AnnotationVisitor {
- public LoadResource(AnnotationVisitor av) {
+ LoadResource(AnnotationVisitor av) {
super(Opcodes.ASM5, av);
}
@@ -592,6 +669,42 @@ public AnnotationVisitor visitAnnotation(String name, String desc) {
return new LoadResource(super.visitAnnotation(name, desc));
}
}
+
+ private final class RetentionChange extends AnnotationVisitor {
+ RetentionChange(AnnotationVisitor av) {
+ super(Opcodes.ASM5, av);
+ }
+
+ @Override
+ public void visit(String attrName, Object value) {
+ super.visit(attrName, value);
+ }
+
+ @Override
+ public AnnotationVisitor visitArray(String name) {
+ return super.visitArray(name);
+ }
+
+ @Override
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ return super.visitAnnotation(desc, desc);
+ }
+
+ @Override
+ public void visitEnum(String value, String retentionPolicy, String type) {
+ if ("Ljava/lang/annotation/RetentionPolicy;".equals(retentionPolicy)) {
+ found++;
+ super.visitEnum(value, retentionPolicy, "RUNTIME");
+ } else {
+ super.visitEnum(value, retentionPolicy, type);
+ }
+ }
+
+ @Override
+ public void visitEnd() {
+ super.visitEnd();
+ }
+ }
}
private static class ClassWriterEx extends ClassWriter {
diff --git a/boot/src/main/java/org/netbeans/html/boot/impl/JsAgent.java b/boot/src/main/java/org/netbeans/html/boot/impl/JsAgent.java
index a2df117a1..8f16b444a 100644
--- a/boot/src/main/java/org/netbeans/html/boot/impl/JsAgent.java
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JsAgent.java
@@ -21,6 +21,7 @@
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.IllegalClassFormatException;
import java.lang.instrument.Instrumentation;
+import java.nio.charset.StandardCharsets;
import java.security.ProtectionDomain;
/**
@@ -39,13 +40,28 @@ public static void agentmain(String args, Instrumentation instr) {
@Override
public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
try {
- if (JsPkgCache.process(loader, className)) {
- return FnUtils.transform(classfileBuffer, loader);
+ if (containsJavaBodies(classfileBuffer)) {
+ return FnUtils.transform(classfileBuffer, loader, true);
} else {
return classfileBuffer;
}
- } catch (Exception ex) {
+ } catch (Error | Exception ex) {
+ System.err.println("Error transforming " + className);
+ ex.printStackTrace();
return classfileBuffer;
}
}
+
+ private static final byte[] PATTERN = new String("net/java/html/js/").getBytes(StandardCharsets.UTF_8);
+ private static boolean containsJavaBodies(byte[] arr) {
+ NOT_FOUND: for (var i = 0; i < arr.length - PATTERN.length; i++) {
+ for (var j = 0; j < PATTERN.length; j++) {
+ if (arr[i + j] != PATTERN[j]) {
+ continue NOT_FOUND;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
}
diff --git a/boot/src/main/java/org/netbeans/html/boot/impl/JsPkgCache.java b/boot/src/main/java/org/netbeans/html/boot/impl/JsPkgCache.java
index 6d68d7dc4..49c5f1166 100644
--- a/boot/src/main/java/org/netbeans/html/boot/impl/JsPkgCache.java
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JsPkgCache.java
@@ -28,22 +28,32 @@
import java.util.Set;
import java.util.TreeSet;
import java.util.WeakHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
*
* @author Jaroslav Tulach
*/
final class JsPkgCache {
- private final Map