Skip to content

Commit 29e0457

Browse files
add support for lucee7
1 parent 444558f commit 29e0457

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

luceedebug/src/main/java/luceedebug/LuceeTransformer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ else if (className.equals("lucee/runtime/PageContextImpl")) {
101101
return null;
102102
}
103103
}
104-
else if (superClass.equals("lucee/runtime/ComponentPageImpl") || superClass.equals("lucee/runtime/PageImpl")) {
104+
else if (
105+
superClass.equals("lucee/runtime/ComponentPageImpl")
106+
|| superClass.equals("lucee/runtime/PageImpl")
107+
|| superClass.equals("lucee/runtime/Page") // seems to be necessary for lucee7
108+
) {
105109
// System.out.println("[luceedebug] Instrumenting " + className);
106110
if (GlobalIDebugManagerHolder.luceeCoreLoader == null) {
107111
System.out.println("Got class " + className + " before receiving PageContextImpl, debugging will fail.");

luceedebug/src/test/java/luceedebug/HitsABreakpointAndRetrievesVariableInfo.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ void a(LuceeAndDockerInfo dockerInfo) throws Throwable {
142142
else if (dockerInfo.engineVersion == 6) {
143143
assertEquals("42", target.getValue());
144144
}
145+
else if (dockerInfo.engineVersion == 7) {
146+
assertEquals("42.0", target.getValue());
147+
}
145148
else {
146149
unreachable();
147150
}

luceedebug/src/test/java/luceedebug/testutils/TestParams.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public String toString() {
3232
public static LuceeAndDockerInfo[] getLuceeAndDockerInfo() {
3333
return new LuceeAndDockerInfo[] {
3434
new LuceeAndDockerInfo(5, "../test/docker/5"),
35-
new LuceeAndDockerInfo(6, "../test/docker/6")
35+
new LuceeAndDockerInfo(6, "../test/docker/6"),
36+
new LuceeAndDockerInfo(7, "../test/docker/7")
3637
};
3738
}
3839
}

test/docker/7/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM lucee/lucee:7.0.0.317-SNAPSHOT-nginx-tomcat11.0-jdk21-temurin-noble
2+
3+
# "@LUCEEDEBUG_JAR" replaced programmatically with filename
4+
ENV LUCEEDEBUG_JAR /build/@LUCEEDEBUG_JAR
5+
ENV SETENV_FILE /usr/local/tomcat/bin/setenv.sh
6+
7+
#RUN apt-get update
8+
#RUN apt-get -y install vim
9+
10+
# build up catalina opts to include jdwp and luceedebug
11+
RUN echo export CATALINA_OPTS='"''$CATALINA_OPTS' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:9999'"' >> ${SETENV_FILE}
12+
RUN echo export CATALINA_OPTS='"''$CATALINA_OPTS' -javaagent:${LUCEEDEBUG_JAR}=jdwpHost=localhost,jdwpPort=9999,cfHost=0.0.0.0,cfPort=10000,jarPath=${LUCEEDEBUG_JAR}'"' >> ${SETENV_FILE}

0 commit comments

Comments
 (0)