Merge pull request #5394 from jGauravGupta/FISH-5687-2

FISH-5687/FISH-1467 Integrate HotSwap Agent in Payara Platform
payara · Sep 17, 2021 · 494f2b0 · 494f2b0
2 parents b1c9d16 + d9fa844
commit 494f2b0
Show file tree

Hide file tree

Showing 32 changed files with 814 additions and 452 deletions.
diff --git a/appserver/admin/gf_template/src/main/resources/config/domain.xml b/appserver/admin/gf_template/src/main/resources/config/domain.xml
@@ -42,7 +42,7 @@
 
 -->
 
-<!-- Portions Copyright [2017-2020] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright [2017-2021] [Payara Foundation and/or its affiliates] -->
 
 <domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
     <hazelcast-runtime-configuration start-port="%%%HAZELCAST_START_PORT%%%" das-port="%%%HAZELCAST_DAS_PORT%%%" auto-increment-port="%%%HAZELCAST_AUTO_INCREMENT%%%"></hazelcast-runtime-configuration>
@@ -273,6 +273,9 @@
                 <jvm-options>[Azul-1.8.0u222|1.8.0u260]-XX:+UseOpenJSSE</jvm-options>
                 <!-- allow asadmin command enable-monitoring for JDK 9+ -->
                 <jvm-options>[9|]-Djdk.attach.allowAttachSelf=true</jvm-options>
+                <!-- Hotswap Agent -->
+                <jvm-options>[Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core</jvm-options>
+                <jvm-options>[Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info</jvm-options>
             </java-config>
             <availability-service>
                 <web-container-availability />
@@ -503,6 +506,9 @@
                 <jvm-options>[1.8.0u191|1.8.0u250]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
                 <jvm-options>[1.8.0u251|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
                 <jvm-options>[Azul-1.8.0u222|1.8.0u260]-XX:+UseOpenJSSE</jvm-options>
+                <!-- Hotswap Agent -->
+                <jvm-options>[Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core</jvm-options>
+                <jvm-options>[Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info</jvm-options>
             </java-config>
             <availability-service>
                 <web-container-availability />

diff --git a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
@@ -3,7 +3,7 @@
 <!--
    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-   Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+   Copyright (c) [2017-2021] Payara Foundation and/or its affiliates. All rights reserved.
 
    The contents of this file are subject to the terms of either the GNU
    General Public License Version 2 only ("GPL") or the Common Development
@@ -267,7 +267,10 @@
         <jvm-options>[1.8.0u251|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
         <jvm-options>[Azul-1.8.0u222|1.8.0u260]-XX:+UseOpenJSSE</jvm-options>
         <!-- allow asadmin command enable-monitoring for JDK 9+ -->
-        <jvm-options>[9|]-Djdk.attach.allowAttachSelf=true</jvm-options>
+        <jvm-options>[9|]-Djdk.attach.allowAttachSelf=true</jvm-options>                
+        <!-- Hotswap Agent -->
+        <jvm-options>[Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core</jvm-options>
+        <jvm-options>[Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info</jvm-options>
       </java-config>
       <availability-service>
         <web-container-availability />
@@ -494,6 +497,9 @@
         <jvm-options>[1.8.0u191|1.8.0u250]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
         <jvm-options>[1.8.0u251|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
         <jvm-options>[Azul-1.8.0u222|1.8.0u260]-XX:+UseOpenJSSE</jvm-options>
+        <!-- Hotswap Agent -->
+        <jvm-options>[Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core</jvm-options>
+        <jvm-options>[Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info</jvm-options>
       </java-config>
       <availability-service>
         <web-container-availability />

diff --git a/...on/annotation-framework/src/main/java/org/glassfish/apf/impl/AnnotationProcessorImpl.java b/...on/annotation-framework/src/main/java/org/glassfish/apf/impl/AnnotationProcessorImpl.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2016-2020] [Payara Foundation and/or affiliates]
+// Portions Copyright [2016-2021] [Payara Foundation and/or affiliates]
 
 package org.glassfish.apf.impl;
 
@@ -57,7 +57,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Member;
 import java.util.Optional;
 import java.util.logging.Logger;
 
@@ -73,10 +72,6 @@
 import org.glassfish.apf.ProcessingResult;
 import org.glassfish.apf.Scanner;
 import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import org.glassfish.api.deployment.DeployCommandParameters;
-import org.glassfish.hk2.classmodel.reflect.Type;
-
 
 /**
  *
@@ -160,7 +155,7 @@ public ProcessingResult process(ProcessingContext ctx)
             processorState.ifPresent(s -> s.setProcessingResult(result));
         } else {
             result = processorState.get().getProcessingResult(ProcessingResultImpl.class);
-            for (Class modifiedClass : scanner.getElements(state.getClassesChanged())) {
+            for (Class modifiedClass : scanner.getElements(state.getClassesChanged().keySet())) {
                 result.add(process(ctx, modifiedClass));
             }
         }