Skip to content

Commit

Permalink
chore(rest): remove WAS 9 support
Browse files Browse the repository at this point in the history
Related to camunda#3607
  • Loading branch information
mboskamp authored Aug 4, 2023
1 parent f20f5fe commit e02f88f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 90 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:maven:assembly:1.1.2">

<id>was9</id>
<id>was</id>

<formats>
<format>war</format>
Expand All @@ -12,7 +12,7 @@

<fileSets>
<fileSet>
<directory>src/main/runtime/was9/webapp</directory>
<directory>src/main/runtime/was/webapp</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Expand Down
6 changes: 3 additions & 3 deletions engine-rest/assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@
</execution>

<execution>
<id>was9</id>
<id>was</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly-war-was9.xml</descriptor>
<descriptor>assembly-war-was.xml</descriptor>
</descriptors>
<finalName>camunda-engine-rest-${project.version}</finalName>
<attach>true</attach>
<classifier>was9</classifier>
<classifier>was</classifier>
<outputDirectory>target/</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
</configuration>
Expand Down
30 changes: 22 additions & 8 deletions engine-rest/assembly/src/main/runtime/was/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">

<display-name>Camunda Platform rest api</display-name>
<display-name>Camunda Platform REST API</display-name>

<!-- Fetch And Lock Handler (long polling): Unique Worker Request (default value: false) -->
<!--
<context-param>
<param-name>fetch-and-lock-unique-worker-request</param-name>
<param-value>true</param-value>
</context-param>
-->

<!-- rest bootstrap listener -->
<listener>
<listener-class>org.camunda.bpm.engine.rest.impl.web.bootstrap.RestContainerBootstrap</listener-class>
</listener>

<listener>
<listener-class>org.camunda.bpm.engine.rest.impl.FetchAndLockContextListener</listener-class>
</listener>

<filter>
<filter-name>EmptyBodyFilter</filter-name>
<filter-class>org.camunda.bpm.engine.rest.filter.EmptyBodyFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>EmptyBodyFilter</filter-name>
Expand All @@ -21,20 +34,20 @@

<filter>
<filter-name>CacheControlFilter</filter-name>
<filter-class>org.camunda.bpm.engine.rest.filter.CacheControlFilter</filter-class>
<filter-class>org.camunda.bpm.engine.rest.filter.CacheControlFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>CacheControlFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>

<!-- Http Basic Authentication Filter -->
<!-- <filter>
<filter-name>camunda-auth</filter-name>
<filter-class>
org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter
</filter-class>
<async-supported>true</async-supported>
<init-param>
<param-name>authentication-provider</param-name>
<param-value>org.camunda.bpm.engine.rest.security.auth.impl.HttpBasicAuthenticationProvider</param-value>
Expand All @@ -45,14 +58,15 @@
<filter-name>camunda-auth</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping> -->

<servlet>
<servlet-name>Engine API</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.camunda.bpm.engine.rest.impl.application.DefaultApplication</param-value>
</init-param>
<async-supported>true</async-supported>
</servlet>

<servlet-mapping>
Expand Down
77 changes: 0 additions & 77 deletions engine-rest/assembly/src/main/runtime/was9/webapp/WEB-INF/web.xml

This file was deleted.

0 comments on commit e02f88f

Please sign in to comment.