This is an automated email from the ASF dual-hosted git repository. imesha pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/oodt.git
commit 749af12330dcbe828185855963fb80fd62f400e3 Author: Imesha Sudasingha <[email protected]> AuthorDate: Sun Aug 22 09:14:47 2021 +0530 Updare cors headers and deployment docker profile --- deployment/pom.xml | 117 +++++++++++---------- .../oodt/cas/product/jaxrs/filters/CORSFilter.java | 2 +- .../oodt/cas/wmservices/filters/CORSFilter.java | 2 +- 3 files changed, 63 insertions(+), 58 deletions(-) diff --git a/deployment/pom.xml b/deployment/pom.xml index 8978700..f47b96d 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -59,62 +59,67 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>unpack</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>unpack</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-filemgr</artifactId> + <version>${project.version}</version> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-compose</outputDirectory> + <includes>*/policy/**</includes> + </artifactItem> + <artifactItem> + <groupId>org.apache.oodt</groupId> + <artifactId>cas-workflow</artifactId> + <version>${project.version}</version> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/docker-compose</outputDirectory> + <includes>*/policy/**</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-filemgr</artifactId> - <version>${project.version}</version> - <type>zip</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-compose</outputDirectory> - <includes>*/policy/**</includes> - </artifactItem> - <artifactItem> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-workflow</artifactId> - <version>${project.version}</version> - <type>zip</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/docker-compose</outputDirectory> - <includes>*/policy/**</includes> - </artifactItem> - </artifactItems> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>assembly.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - <phase>install</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + <phase>install</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/CORSFilter.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/CORSFilter.java index 1185822..0bc0323 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/CORSFilter.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/filters/CORSFilter.java @@ -62,7 +62,7 @@ public class CORSFilter implements Filter { // Authorize (allow) all domains to consume the content resp.addHeader("Access-Control-Allow-Origin", "*"); - resp.addHeader("Access-Control-Allow-Methods", "GET, OPTIONS, HEAD, PUT, POST"); + resp.addHeader("Access-Control-Allow-Methods", "GET, OPTIONS, HEAD, PUT, POST, DELETE"); // For HTTP OPTIONS verb/method reply with ACCEPTED status code -- per CORS handshake if (request.getMethod().equals("OPTIONS")) { diff --git a/webapp/wmservices/src/main/java/org/apache/oodt/cas/wmservices/filters/CORSFilter.java b/webapp/wmservices/src/main/java/org/apache/oodt/cas/wmservices/filters/CORSFilter.java index 5b16ab3..ba0a8bb 100644 --- a/webapp/wmservices/src/main/java/org/apache/oodt/cas/wmservices/filters/CORSFilter.java +++ b/webapp/wmservices/src/main/java/org/apache/oodt/cas/wmservices/filters/CORSFilter.java @@ -50,7 +50,7 @@ public class CORSFilter implements Filter { // Authorize (allow) all domains to consume the content resp.addHeader("Access-Control-Allow-Origin", "*"); - resp.addHeader("Access-Control-Allow-Methods", "GET, OPTIONS, HEAD, PUT, POST"); + resp.addHeader("Access-Control-Allow-Methods", "GET, OPTIONS, HEAD, PUT, POST, DELETE"); // For HTTP OPTIONS verb/method reply with ACCEPTED status code -- per CORS handshake if (request.getMethod().equals("OPTIONS")) {
