Skip to content

Commit

Permalink
Auto-initialize JAX-RS applications
Browse files Browse the repository at this point in the history 
The web.xml files in most webapps (except ACME and EST) have
been modified to drop the RESTEasy servlet declaration and
let the JAX-RS applications be initialized automatically by
resteasy-servlet-initializer.

https://docs.jboss.org/resteasy/docs/3.0.24.Final/userguide/html_single/#d4e143
  • Loading branch information
@edewata
edewata committed Jun 21, 2023
1 parent e7ad62e commit ed6b8c6
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 213 deletions.
37 changes: 0 additions & 37 deletions base/ca/shared/webapps/ca/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,6 @@

<display-name>Certificate Authority</display-name>

<!-- ==================== RESTEasy Configuration =============== -->

<listener>
<listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap </listener-class>
</listener>

<context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/rest</param-value>
</context-param>

<context-param>
<param-name>resteasy.role.based.security</param-name>
<param-value>true</param-value>
</context-param>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>
org.jboss.resteasy.core.ResourceMethodSecurityInterceptor
</param-value>
</context-param>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.server.ca.rest.CAApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>Resteasy</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>

<security-constraint>
<web-resource-collection>
<web-resource-name>Account Services</web-resource-name>
Expand Down
2 changes: 2 additions & 0 deletions base/ca/src/main/java/org/dogtagpki/server/ca/rest/CAApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

import org.dogtagpki.server.rest.ACLInterceptor;
Expand All @@ -19,6 +20,7 @@
import org.dogtagpki.server.rest.SessionContextInterceptor;
import org.dogtagpki.server.rest.UserService;

@ApplicationPath("/rest")
public class CAApplication extends Application {

public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CAApplication.class);
Expand Down
38 changes: 0 additions & 38 deletions base/kra/shared/webapps/kra/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,44 +547,6 @@
<param-value> admin </param-value> </init-param>
</servlet>


<!-- ==================== RESTEasy Configuration =============== -->

<listener>
<listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap </listener-class>
</listener>

<context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/rest</param-value>
</context-param>

<context-param>
<param-name>resteasy.role.based.security</param-name>
<param-value>true</param-value>
</context-param>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>
org.jboss.resteasy.core.ResourceMethodSecurityInterceptor
</param-value>
</context-param>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.server.kra.rest.KRAApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>Resteasy</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> kraserver </servlet-name>
<url-pattern> /server </url-pattern>
Expand Down
2 changes: 2 additions & 0 deletions base/kra/src/main/java/org/dogtagpki/server/kra/rest/KRAApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

import org.dogtagpki.server.rest.ACLInterceptor;
Expand All @@ -18,6 +19,7 @@
import org.dogtagpki.server.rest.SessionContextInterceptor;
import org.dogtagpki.server.rest.UserService;

@ApplicationPath("/rest")
public class KRAApplication extends Application {

public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(KRAApplication.class);
Expand Down
35 changes: 0 additions & 35 deletions base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,41 +446,6 @@
<param-value> admin </param-value> </init-param>
</servlet>

<listener>
<listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap </listener-class>
</listener>

<context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/rest</param-value>
</context-param>

<context-param>
<param-name>resteasy.role.based.security</param-name>
<param-value>true</param-value>
</context-param>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>
org.jboss.resteasy.core.ResourceMethodSecurityInterceptor
</param-value>
</context-param>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.server.ocsp.rest.OCSPApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>Resteasy</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> ocspacl </servlet-name>
<url-pattern> /acl </url-pattern>
Expand Down
2 changes: 2 additions & 0 deletions base/ocsp/src/main/java/org/dogtagpki/server/ocsp/rest/OCSPApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

import org.dogtagpki.server.rest.ACLInterceptor;
Expand All @@ -17,6 +18,7 @@
import org.dogtagpki.server.rest.SessionContextInterceptor;
import org.dogtagpki.server.rest.UserService;

@ApplicationPath("/rest")
public class OCSPApplication extends Application {

public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(OCSPApplication.class);
Expand Down
2 changes: 2 additions & 0 deletions base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

@ApplicationPath("/rest")
public class PKIApplication extends Application {

private Set<Object> singletons = new LinkedHashSet<>();
Expand Down
35 changes: 0 additions & 35 deletions base/server-webapp/webapps/pki/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,6 @@

<display-name>PKI</display-name>

<listener>
<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
</listener>

<context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/rest</param-value>
</context-param>

<context-param>
<param-name>resteasy.role.based.security</param-name>
<param-value>true</param-value>
</context-param>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>
org.jboss.resteasy.core.ResourceMethodSecurityInterceptor
</param-value>
</context-param>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.server.rest.PKIApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>Resteasy</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>

<mime-mapping>
<extension>properties</extension>
<mime-type>text/plain</mime-type>
Expand Down
35 changes: 0 additions & 35 deletions base/tks/shared/webapps/tks/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,41 +234,6 @@
<param-value> tksGetStatus </param-value> </init-param>
</servlet>

<listener>
<listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap </listener-class>
</listener>

<context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/rest</param-value>
</context-param>

<context-param>
<param-name>resteasy.role.based.security</param-name>
<param-value>true</param-value>
</context-param>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>
org.jboss.resteasy.core.ResourceMethodSecurityInterceptor
</param-value>
</context-param>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.server.tks.rest.TKSApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>Resteasy</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name> tksug </servlet-name>
<url-pattern> /ug </url-pattern>
Expand Down
2 changes: 2 additions & 0 deletions base/tks/src/main/java/org/dogtagpki/server/tks/rest/TKSApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

import org.dogtagpki.server.rest.ACLInterceptor;
Expand All @@ -17,6 +18,7 @@
import org.dogtagpki.server.rest.SessionContextInterceptor;
import org.dogtagpki.server.rest.UserService;

@ApplicationPath("/rest")
public class TKSApplication extends Application {

private Set<Object> singletons = new LinkedHashSet<>();
Expand Down
33 changes: 0 additions & 33 deletions base/tps/shared/webapps/tps/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,39 +88,6 @@
<servlet-class>org.dogtagpki.server.tps.TPSServlet</servlet-class>
</servlet>

<listener>
<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
</listener>

<context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/rest</param-value>
</context-param>

<context-param>
<param-name>resteasy.role.based.security</param-name>
<param-value>true</param-value>
</context-param>

<context-param>
<param-name>resteasy.resource.method-interceptors</param-name>
<param-value>org.jboss.resteasy.core.ResourceMethodSecurityInterceptor</param-value>
</context-param>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.dogtagpki.server.tps.rest.TPSApplication</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>Resteasy</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>tpsug</servlet-name>
<url-pattern>/ug</url-pattern>
Expand Down
2 changes: 2 additions & 0 deletions base/tps/src/main/java/org/dogtagpki/server/tps/rest/TPSApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.LinkedHashSet;
import java.util.Set;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;

import org.dogtagpki.server.rest.ACLInterceptor;
Expand All @@ -38,6 +39,7 @@
/**
* @author Endi S. Dewata <[email protected]>
*/
@ApplicationPath("/rest")
public class TPSApplication extends Application {

private Set<Object> singletons = new LinkedHashSet<>();
Expand Down

0 comments on commit ed6b8c6

Please sign in to comment.