Fixes issue #2306 - Rename standard/slim extensions to better reflect…

… what they do (#2307)

core/api/src/main/java/cloud/piranha/core/api/SecurityManager.java

@@ -125,7 +125,9 @@ default void declareRoles(Collection<String> roles) {
  *
  * @return the auth method.
  */
- String getAuthMethod();
+ default String getAuthMethod() {
+ return null;
+ }
 
  /**
  * Gets the request object the security system wants to put in place.
@@ -162,28 +164,36 @@ default HttpServletResponse getAuthenticatedResponse(HttpServletRequest request,
  *
  * @return true if we are, false otherwise.
  */
- boolean getDenyUncoveredHttpMethods();
+ default boolean getDenyUncoveredHttpMethods() {
+ return false;
+ }
 
  /**
  * Get the form error page.
  * 
  * @return the form error page.
  */
- String getFormErrorPage();
+ default String getFormErrorPage() {
+ return null;
+ }
 
  /**
  * Get the form login page.
  *
  * @return the form login page.
  */
- String getFormLoginPage();
+ default String getFormLoginPage() {
+ return null;
+ }
 
  /**
  * Get the realm name.
  *
  * @return the realm name.
  */
- String getRealmName();
+ default String getRealmName() {
+ return null;
+ }
 
  /**
  * Get the declared roles
@@ -296,35 +306,40 @@ default void postRequestProcess(HttpServletRequest request, HttpServletResponse
  *
  * @param authMethod the auth method.
  */
- void setAuthMethod(String authMethod);
+ default void setAuthMethod(String authMethod) {
+ }
 
  /**
  * Set if we are denying uncovered HTTP methods.
  *
  * @param denyUncoveredHttpMethods the boolean value.
  */
- void setDenyUncoveredHttpMethods(boolean denyUncoveredHttpMethods);
+ default void setDenyUncoveredHttpMethods(boolean denyUncoveredHttpMethods) {
+ }
 
  /**
  * Set the form error page.
  * 
  * @param formErrorPage the form error page.
  */
- void setFormErrorPage(String formErrorPage);
+ default void setFormErrorPage(String formErrorPage) {
+ }
 
  /**
  * Set the form login page.
  *
  * @param formLoginPage the form login page.
  */
- void setFormLoginPage(String formLoginPage);
+ default void setFormLoginPage(String formLoginPage) {
+ }
 
  /**
  * Set the realm name.
  *
  * @param realmName the realm name.
  */
- void setRealmName(String realmName);
+ default void setRealmName(String realmName) {
+ }
 
  /**
  * Set the web application.

extension/exousia/pom.xml

@@ -16,6 +16,12 @@
 
  <dependencies>
  <!-- compile -->
+ <dependency>
+ <groupId>cloud.piranha.core</groupId>
+ <artifactId>piranha-core-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>jakarta.authorization</groupId>
  <artifactId>jakarta.authorization-api</artifactId>
@@ -38,18 +44,5 @@
  </exclusion>
  </exclusions>
  </dependency>
- <!-- provided -->
- <dependency>
- <groupId>cloud.piranha.core</groupId>
- <artifactId>piranha-core-impl</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-webxml</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 </project>

extension/exousia/src/main/java/module-info.java

@@ -36,9 +36,7 @@
  * @author Manfred Riem (mriem@manorrock.com)
  */
 module cloud.piranha.extension.exousia {
-
  exports cloud.piranha.extension.exousia;
- requires cloud.piranha.extension.webxml;
  requires cloud.piranha.core.api;
  requires cloud.piranha.core.impl;
  requires jakarta.security.jacc;

extension/lite/pom.xml

@@ -38,49 +38,49 @@
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-locale_encoding</artifactId>
+ <artifactId>piranha-extension-policy</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-mimetype</artifactId>
+ <artifactId>piranha-extension-security-servlet</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-policy</artifactId>
+ <artifactId>piranha-extension-standard-localeencoding</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-scinitializer</artifactId>
+ <artifactId>piranha-extension-standard-mimetype</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-security-servlet</artifactId>
+ <artifactId>piranha-extension-standard-servletannotations</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-tempdir</artifactId>
+ <artifactId>piranha-extension-standard-scinitializer</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-webannotations</artifactId>
+ <artifactId>piranha-extension-standard-tempdir</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>cloud.piranha.extension</groupId>
- <artifactId>piranha-extension-webxml</artifactId>
+ <artifactId>piranha-extension-standard-webxml</artifactId>
  <version>${project.version}</version>
  <scope>compile</scope>
  </dependency>

extension/lite/src/main/java/cloud/piranha/extension/lite/LiteExtension.java

@@ -31,14 +31,14 @@
 import cloud.piranha.core.api.WebApplicationExtensionContext;
 import cloud.piranha.extension.annotationscan.AnnotationScanExtension;
 import cloud.piranha.extension.herring.HerringExtension;
-import cloud.piranha.extension.locale_encoding.LocaleEncodingExtension;
-import cloud.piranha.extension.mimetype.MimeTypeExtension;
 import cloud.piranha.extension.policy.PolicyExtension;
-import cloud.piranha.extension.scinitializer.ServletContainerInitializerExtension;
 import cloud.piranha.extension.security.servlet.ServletSecurityExtension;
-import cloud.piranha.extension.tempdir.TempDirExtension;
-import cloud.piranha.extension.webannotations.WebAnnotationsExtension;
-import cloud.piranha.extension.webxml.WebXmlExtension;
+import cloud.piranha.extension.standard.localeencoding.StandardLocaleEncodingExtension;
+import cloud.piranha.extension.standard.mimetype.StandardMimeTypeExtension;
+import cloud.piranha.extension.standard.scinitializer.StandardServletContainerInitializerExtension;
+import cloud.piranha.extension.standard.servletannotations.StandardServletAnnotationsExtension;
+import cloud.piranha.extension.standard.tempdir.StandardTempDirExtension;
+import cloud.piranha.extension.standard.webxml.StandardWebXmlExtension;
 
 /**
  * The WebApplicationExtension that adds the extensions for a Lite version of
@@ -50,15 +50,15 @@ public class LiteExtension implements WebApplicationExtension {
 
  @Override
  public void extend(WebApplicationExtensionContext context) {
+ context.add(StandardLocaleEncodingExtension.class);
+ context.add(StandardMimeTypeExtension.class);
+ context.add(StandardTempDirExtension.class);
  context.add(HerringExtension.class);
- context.add(MimeTypeExtension.class);
- context.add(LocaleEncodingExtension.class);
  context.add(PolicyExtension.class);
  context.add(AnnotationScanExtension.class);
- context.add(WebXmlExtension.class);
- context.add(WebAnnotationsExtension.class);
- context.add(TempDirExtension.class);
- context.add(ServletContainerInitializerExtension.class);
+ context.add(StandardWebXmlExtension.class);
+ context.add(StandardServletAnnotationsExtension.class);
+ context.add(StandardServletContainerInitializerExtension.class);
  context.add(ServletSecurityExtension.class);
  }
 }

extension/lite/src/main/java/module-info.java

@@ -36,14 +36,8 @@
  * <ul>
  * <li>Annotation scanning support</li>
  * <li>JNDI support</li>
- * <li>Locale encoding support</li>
- * <li>Mime-type support</li>
  * <li>Policy support</li>
- * <li>ServletContainerInitializer support</li>
  * <li>Servlet Security support</li>
- * <li>TEMPDIR support</li>
- * <li>Web annotations support</li>
- * <li>web.xml support</li>
  * </ul>
  */
 module cloud.piranha.extension.lite {
@@ -52,12 +46,12 @@
  requires cloud.piranha.core.api;
  requires transitive cloud.piranha.extension.annotationscan;
  requires transitive cloud.piranha.extension.herring;
- requires transitive cloud.piranha.extension.locale_encoding;
- requires transitive cloud.piranha.extension.mimetype;
  requires transitive cloud.piranha.extension.policy;
- requires transitive cloud.piranha.extension.scinitializer;
  requires transitive cloud.piranha.extension.security.servlet;
- requires transitive cloud.piranha.extension.tempdir;
- requires transitive cloud.piranha.extension.webannotations;
- requires transitive cloud.piranha.extension.webxml;
+ requires transitive cloud.piranha.extension.standard.localeencoding;
+ requires transitive cloud.piranha.extension.standard.mimetype;
+ requires transitive cloud.piranha.extension.standard.servletannotations;
+ requires transitive cloud.piranha.extension.standard.scinitializer;
+ requires transitive cloud.piranha.extension.standard.tempdir;
+ requires transitive cloud.piranha.extension.standard.webxml;
 }