Fixes #3639 - Rename WaSP maven module to eclipse-wasp (#3640)

piranhacloud · Jan 31, 2024 · 4fd9bd8 · 4fd9bd8
1 parent 7158c14
commit 4fd9bd8
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 36 deletions.
diff --git a/...eclipse-expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java b/...eclipse-expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java
@@ -51,6 +51,6 @@ public class ExpresslyExtension implements WebApplicationExtension {
  */
  @Override
  public void configure(WebApplication webApplication) {
- LOGGER.log(TRACE, "Initializing Expressly extension");
+ LOGGER.log(TRACE, "Configuring Expressly extension");
  }
 }
diff --git a/extension/wasp/pom.xml → extension/eclipse-wasp/pom.xml b/extension/wasp/pom.xml → extension/eclipse-wasp/pom.xml
@@ -9,7 +9,7 @@
  <version>24.2.0-SNAPSHOT</version>
  </parent>
 
- <artifactId>piranha-extension-wasp</artifactId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
  <packaging>jar</packaging>
 
  <name>Piranha - Extension - Eclipse WaSP</name>

diff --git a/...piranha/extension/wasp/WaspExtension.java → ...piranha/extension/wasp/WaspExtension.java b/...piranha/extension/wasp/WaspExtension.java → ...piranha/extension/wasp/WaspExtension.java
@@ -34,6 +34,7 @@
 import cloud.piranha.core.api.WebApplication;
 import cloud.piranha.core.api.WebApplicationExtension;
 import jakarta.servlet.ServletContainerInitializer;
+import static java.lang.System.Logger.Level.TRACE;
 
 /**
  * The extension that will enable WaSP integration (aka. JSP).
@@ -54,8 +55,9 @@ public class WaspExtension implements WebApplicationExtension {
  */
  @Override
  public void configure(WebApplication webApplication) {
+ LOGGER.log(TRACE, "Configuring WaSP extension");
+
  try {
-
  webApplication.addInitializer(
  webApplication.getClassLoader()
  .loadClass(WaspInitializer.class.getName())
@@ -64,7 +66,7 @@ public void configure(WebApplication webApplication) {
  .newInstance());
 
  } catch (ReflectiveOperationException | SecurityException ex) {
- LOGGER.log(WARNING, "Unable to enable the WaSP extension", ex);
+ LOGGER.log(WARNING, "Unable to configure the WaSP extension", ex);
  }
  }
 }
diff --git a/...ranha/extension/wasp/WaspInitializer.java → ...ranha/extension/wasp/WaspInitializer.java b/...ranha/extension/wasp/WaspInitializer.java → ...ranha/extension/wasp/WaspInitializer.java
diff --git a/...iranha/extension/wasp/WaspJspManager.java → ...iranha/extension/wasp/WaspJspManager.java b/...iranha/extension/wasp/WaspJspManager.java → ...iranha/extension/wasp/WaspJspManager.java
diff --git a/...tension/wasp/WaspJspManagerExtension.java → ...tension/wasp/WaspJspManagerExtension.java b/...tension/wasp/WaspJspManagerExtension.java → ...tension/wasp/WaspJspManagerExtension.java
diff --git a/...nsion/wasp/WaspJspManagerInitializer.java → ...nsion/wasp/WaspJspManagerInitializer.java b/...nsion/wasp/WaspJspManagerInitializer.java → ...nsion/wasp/WaspJspManagerInitializer.java
diff --git a/...d/piranha/extension/wasp/WaspServlet.java → ...d/piranha/extension/wasp/WaspServlet.java b/...d/piranha/extension/wasp/WaspServlet.java → ...d/piranha/extension/wasp/WaspServlet.java
diff --git a/...nsion/wasp/src/main/java/module-info.java → ...lipse-wasp/src/main/java/module-info.java b/...nsion/wasp/src/main/java/module-info.java → ...lipse-wasp/src/main/java/module-info.java
diff --git a/...nha/extension/wasp/JspDescriptorTest.java → ...nha/extension/wasp/JspDescriptorTest.java b/...nha/extension/wasp/JspDescriptorTest.java → ...nha/extension/wasp/JspDescriptorTest.java
diff --git a/...piranha/extension/wasp/JspWriterTest.java → ...piranha/extension/wasp/JspWriterTest.java b/...piranha/extension/wasp/JspWriterTest.java → ...piranha/extension/wasp/JspWriterTest.java
diff --git a/...a/extension/wasp/WaspInitializerTest.java → ...a/extension/wasp/WaspInitializerTest.java b/...a/extension/wasp/WaspInitializerTest.java → ...a/extension/wasp/WaspInitializerTest.java
diff --git a/...src/test/webapp/jspwriter/clearBuffer.jsp → ...src/test/webapp/jspwriter/clearBuffer.jsp b/...src/test/webapp/jspwriter/clearBuffer.jsp → ...src/test/webapp/jspwriter/clearBuffer.jsp
diff --git a/.../wasp/src/test/webapp/jspwriter/close.jsp → ...-wasp/src/test/webapp/jspwriter/close.jsp b/.../wasp/src/test/webapp/jspwriter/close.jsp → ...-wasp/src/test/webapp/jspwriter/close.jsp
diff --git a/...wasp/src/test/webapp/jspwriter/close2.jsp → ...wasp/src/test/webapp/jspwriter/close2.jsp b/...wasp/src/test/webapp/jspwriter/close2.jsp → ...wasp/src/test/webapp/jspwriter/close2.jsp
diff --git a/...wasp/src/test/webapp/jspwriter/close3.jsp → ...wasp/src/test/webapp/jspwriter/close3.jsp b/...wasp/src/test/webapp/jspwriter/close3.jsp → ...wasp/src/test/webapp/jspwriter/close3.jsp
diff --git a/...wasp/src/test/webapp/jspwriter/close4.jsp → ...wasp/src/test/webapp/jspwriter/close4.jsp b/...wasp/src/test/webapp/jspwriter/close4.jsp → ...wasp/src/test/webapp/jspwriter/close4.jsp
diff --git a/...pp/waspinitializer/WEB-INF/classes/KEEPME → ...pp/waspinitializer/WEB-INF/classes/KEEPME b/...pp/waspinitializer/WEB-INF/classes/KEEPME → ...pp/waspinitializer/WEB-INF/classes/KEEPME
diff --git a/...webapp/waspinitializer/WEB-INF/lib/KEEPME → ...webapp/waspinitializer/WEB-INF/lib/KEEPME b/...webapp/waspinitializer/WEB-INF/lib/KEEPME → ...webapp/waspinitializer/WEB-INF/lib/KEEPME
diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
@@ -39,6 +39,12 @@
  <artifactId>piranha-extension-eclipse-expressly</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-naming-cdi</artifactId>
@@ -83,12 +89,6 @@
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency> 
- <dependency>
- <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-wasp</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-webxml</artifactId>

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -23,6 +23,7 @@
  <module>coreprofile</module>
  <module>default-datasource</module>
  <module>eclipse-expressly</module>
+ <module>eclipse-wasp</module>
  <module>eclipselink</module>
  <module>eleos</module>
  <module>exousia</module>
@@ -41,7 +42,6 @@
  <module>soteria</module>
  <module>tempdir</module>
  <module>transact</module>
- <module>wasp</module>
  <module>webprofile</module>
  <module>webxml</module>
  <module>welcomefile</module>

diff --git a/extension/servlet/pom.xml b/extension/servlet/pom.xml
@@ -50,6 +50,12 @@
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-naming</artifactId>
@@ -86,12 +92,6 @@
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
- <dependency>
- <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-wasp</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-webxml</artifactId>

diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
@@ -56,6 +56,12 @@
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-eclipselink</artifactId>
@@ -104,12 +110,6 @@
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
- <dependency>
- <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-wasp</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-webxml</artifactId>

diff --git a/extension/webxml/pom.xml b/extension/webxml/pom.xml
@@ -59,7 +59,7 @@
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-wasp</artifactId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
  <version>${project.version}</version>
  <scope>test</scope>
  </dependency>

diff --git a/pom.xml b/pom.xml
@@ -247,6 +247,12 @@
  <artifactId>expressly</artifactId>
  <version>${expressly.version}</version>
  </dependency>
+ <!-- Eclipse WaSP -->
+ <dependency>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
+ <version>${wasp.version}</version>
+ </dependency>
 
  <!-- Eclipse Exousia -->
  <dependency>
@@ -366,12 +372,6 @@
  <version>${tyrus.version}</version>
  </dependency>
 
- <!-- Eclipse WaSP -->
- <dependency>
- <groupId>org.glassfish.wasp</groupId>
- <artifactId>wasp</artifactId>
- <version>${wasp.version}</version>
- </dependency>
 
  <!-- Eclipse Yasson -->
  <dependency>

diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -66,6 +66,17 @@
  <version>${project.version}</version>
  </dependency>
 
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-expressly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cloud.piranha.extension</groupId>
+ <artifactId>piranha-extension-eclipse-wasp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-eleos</artifactId>
@@ -138,12 +149,6 @@
  <version>${project.version}</version>
  </dependency>
 
- <dependency>
- <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-wasp</artifactId>
- <version>${project.version}</version>
- </dependency>
-
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
  <artifactId>piranha-extension-webxml</artifactId>