diff --git a/integration-test/build.gradle b/integration-test/build.gradle index 0cfb5ee3..b88e1d8f 100644 --- a/integration-test/build.gradle +++ b/integration-test/build.gradle @@ -12,7 +12,7 @@ group = 'com.reajason.javaweb' version = '' dependencies { - testImplementation project(":vul-webapp") + testImplementation project(":vul:vul-webapp") testImplementation project(":common") testImplementation project(":behinder") testImplementation project(":godzilla") @@ -52,11 +52,7 @@ idea { } test { - dependsOn ":vul-webapp:war", ":vul-webapp-expression:war", ":vul-webapp-jakarta:war" + dependsOn ":vul:vul-webapp:war", ":vul:vul-webapp-expression:war", ":vul:vul-webapp-jakarta:war" useJUnitPlatform() -// maxParallelForks Runtime.runtime.availableProcessors().intdiv(2) ?: 1 -// forkEvery = 1 -// systemProperty 'junit.jupiter.execution.parallel.enabled', 'true' -// systemProperty 'junit.jupiter.execution.parallel.mode.default', 'concurrent' finalizedBy jacocoTestReport } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java index 1c4d051d..97b93958 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java @@ -12,9 +12,9 @@ import java.nio.file.Paths; */ @Slf4j public class ContainerTool { - public static final MountableFile warJakartaFile = MountableFile.forHostPath(Paths.get("../vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war").toAbsolutePath()); - public static final MountableFile warExpressionFile = MountableFile.forHostPath(Paths.get("../vul-webapp-expression/build/libs/vul-webapp-expression.war").toAbsolutePath()); - public static final MountableFile warFile = MountableFile.forHostPath(Paths.get("../vul-webapp/build/libs/vul-webapp.war").toAbsolutePath()); + public static final MountableFile warJakartaFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war").toAbsolutePath()); + public static final MountableFile warExpressionFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp-expression/build/libs/vul-webapp-expression.war").toAbsolutePath()); + public static final MountableFile warFile = MountableFile.forHostPath(Paths.get("../vul/vul-webapp/build/libs/vul-webapp.war").toAbsolutePath()); public static String getUrl(GenericContainer container) { diff --git a/settings.gradle b/settings.gradle index 4ae0f618..c90fbac8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,8 @@ include 'deserialize' include 'generator' include 'boot' include 'integration-test' -include 'vul-webapp' -include 'vul-webapp-jakarta' -include 'vul-webapp-expression' +include 'vul' +include 'vul:vul-webapp' +include 'vul:vul-webapp-jakarta' +include 'vul:vul-webapp-expression' \ No newline at end of file diff --git a/vul-webapp-expression/build.gradle b/vul/vul-webapp-expression/build.gradle similarity index 100% rename from vul-webapp-expression/build.gradle rename to vul/vul-webapp-expression/build.gradle diff --git a/vul-webapp-expression/src/main/java/ELServlet.java b/vul/vul-webapp-expression/src/main/java/ELServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/ELServlet.java rename to vul/vul-webapp-expression/src/main/java/ELServlet.java diff --git a/vul-webapp-expression/src/main/java/ErrorFilter.java b/vul/vul-webapp-expression/src/main/java/ErrorFilter.java similarity index 100% rename from vul-webapp-expression/src/main/java/ErrorFilter.java rename to vul/vul-webapp-expression/src/main/java/ErrorFilter.java diff --git a/vul-webapp-expression/src/main/java/ErrorListener.java b/vul/vul-webapp-expression/src/main/java/ErrorListener.java similarity index 100% rename from vul-webapp-expression/src/main/java/ErrorListener.java rename to vul/vul-webapp-expression/src/main/java/ErrorListener.java diff --git a/vul-webapp-expression/src/main/java/FreemarkerServlet.java b/vul/vul-webapp-expression/src/main/java/FreemarkerServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/FreemarkerServlet.java rename to vul/vul-webapp-expression/src/main/java/FreemarkerServlet.java diff --git a/vul-webapp-expression/src/main/java/JavaReadObjServlet.java b/vul/vul-webapp-expression/src/main/java/JavaReadObjServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/JavaReadObjServlet.java rename to vul/vul-webapp-expression/src/main/java/JavaReadObjServlet.java diff --git a/vul-webapp-expression/src/main/java/OgnlServlet.java b/vul/vul-webapp-expression/src/main/java/OgnlServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/OgnlServlet.java rename to vul/vul-webapp-expression/src/main/java/OgnlServlet.java diff --git a/vul-webapp-expression/src/main/java/ScriptEngineServlet.java b/vul/vul-webapp-expression/src/main/java/ScriptEngineServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/ScriptEngineServlet.java rename to vul/vul-webapp-expression/src/main/java/ScriptEngineServlet.java diff --git a/vul-webapp-expression/src/main/java/SpELServlet.java b/vul/vul-webapp-expression/src/main/java/SpELServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/SpELServlet.java rename to vul/vul-webapp-expression/src/main/java/SpELServlet.java diff --git a/vul-webapp-expression/src/main/java/TestServlet.java b/vul/vul-webapp-expression/src/main/java/TestServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/TestServlet.java rename to vul/vul-webapp-expression/src/main/java/TestServlet.java diff --git a/vul-webapp-expression/src/main/java/UploadServlet.java b/vul/vul-webapp-expression/src/main/java/UploadServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/UploadServlet.java rename to vul/vul-webapp-expression/src/main/java/UploadServlet.java diff --git a/vul-webapp-expression/src/main/java/VelocityServlet.java b/vul/vul-webapp-expression/src/main/java/VelocityServlet.java similarity index 100% rename from vul-webapp-expression/src/main/java/VelocityServlet.java rename to vul/vul-webapp-expression/src/main/java/VelocityServlet.java diff --git a/vul-webapp-expression/src/main/webapp/WEB-INF/web.xml b/vul/vul-webapp-expression/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from vul-webapp-expression/src/main/webapp/WEB-INF/web.xml rename to vul/vul-webapp-expression/src/main/webapp/WEB-INF/web.xml diff --git a/vul-webapp-expression/src/main/webapp/index.html b/vul/vul-webapp-expression/src/main/webapp/index.html similarity index 100% rename from vul-webapp-expression/src/main/webapp/index.html rename to vul/vul-webapp-expression/src/main/webapp/index.html diff --git a/vul-webapp-jakarta/build.gradle b/vul/vul-webapp-jakarta/build.gradle similarity index 100% rename from vul-webapp-jakarta/build.gradle rename to vul/vul-webapp-jakarta/build.gradle diff --git a/vul-webapp-jakarta/src/main/java/jakarta/ErrorHandler.java b/vul/vul-webapp-jakarta/src/main/java/jakarta/ErrorHandler.java similarity index 100% rename from vul-webapp-jakarta/src/main/java/jakarta/ErrorHandler.java rename to vul/vul-webapp-jakarta/src/main/java/jakarta/ErrorHandler.java diff --git a/vul-webapp-jakarta/src/main/java/jakarta/JavaReadObjServlet.java b/vul/vul-webapp-jakarta/src/main/java/jakarta/JavaReadObjServlet.java similarity index 100% rename from vul-webapp-jakarta/src/main/java/jakarta/JavaReadObjServlet.java rename to vul/vul-webapp-jakarta/src/main/java/jakarta/JavaReadObjServlet.java diff --git a/vul-webapp-jakarta/src/main/java/jakarta/TestServlet.java b/vul/vul-webapp-jakarta/src/main/java/jakarta/TestServlet.java similarity index 100% rename from vul-webapp-jakarta/src/main/java/jakarta/TestServlet.java rename to vul/vul-webapp-jakarta/src/main/java/jakarta/TestServlet.java diff --git a/vul-webapp-jakarta/src/main/java/jakarta/UploadServlet.java b/vul/vul-webapp-jakarta/src/main/java/jakarta/UploadServlet.java similarity index 100% rename from vul-webapp-jakarta/src/main/java/jakarta/UploadServlet.java rename to vul/vul-webapp-jakarta/src/main/java/jakarta/UploadServlet.java diff --git a/vul-webapp-jakarta/src/main/webapp/WEB-INF/web.xml b/vul/vul-webapp-jakarta/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from vul-webapp-jakarta/src/main/webapp/WEB-INF/web.xml rename to vul/vul-webapp-jakarta/src/main/webapp/WEB-INF/web.xml diff --git a/vul-webapp-jakarta/src/main/webapp/index.html b/vul/vul-webapp-jakarta/src/main/webapp/index.html similarity index 100% rename from vul-webapp-jakarta/src/main/webapp/index.html rename to vul/vul-webapp-jakarta/src/main/webapp/index.html diff --git a/vul-webapp/build.gradle b/vul/vul-webapp/build.gradle similarity index 100% rename from vul-webapp/build.gradle rename to vul/vul-webapp/build.gradle diff --git a/vul-webapp/src/main/java/JavaReadObjServlet.java b/vul/vul-webapp/src/main/java/JavaReadObjServlet.java similarity index 100% rename from vul-webapp/src/main/java/JavaReadObjServlet.java rename to vul/vul-webapp/src/main/java/JavaReadObjServlet.java diff --git a/vul-webapp/src/main/java/ScriptEngineServlet.java b/vul/vul-webapp/src/main/java/ScriptEngineServlet.java similarity index 100% rename from vul-webapp/src/main/java/ScriptEngineServlet.java rename to vul/vul-webapp/src/main/java/ScriptEngineServlet.java diff --git a/vul-webapp/src/main/java/TestServlet.java b/vul/vul-webapp/src/main/java/TestServlet.java similarity index 100% rename from vul-webapp/src/main/java/TestServlet.java rename to vul/vul-webapp/src/main/java/TestServlet.java diff --git a/vul-webapp/src/main/java/UploadServlet.java b/vul/vul-webapp/src/main/java/UploadServlet.java similarity index 100% rename from vul-webapp/src/main/java/UploadServlet.java rename to vul/vul-webapp/src/main/java/UploadServlet.java diff --git a/vul-webapp/src/main/webapp/WEB-INF/ibm-web-ext.xml b/vul/vul-webapp/src/main/webapp/WEB-INF/ibm-web-ext.xml similarity index 100% rename from vul-webapp/src/main/webapp/WEB-INF/ibm-web-ext.xml rename to vul/vul-webapp/src/main/webapp/WEB-INF/ibm-web-ext.xml diff --git a/vul-webapp/src/main/webapp/WEB-INF/web.xml b/vul/vul-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from vul-webapp/src/main/webapp/WEB-INF/web.xml rename to vul/vul-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/vul-webapp/src/main/webapp/index.html b/vul/vul-webapp/src/main/webapp/index.html similarity index 100% rename from vul-webapp/src/main/webapp/index.html rename to vul/vul-webapp/src/main/webapp/index.html