You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by im...@apache.org on 2021/08/22 03:45:25 UTC
[oodt] branch development updated (9e4345a -> 749af12)
This is an automated email from the ASF dual-hosted git repository.
imesha pushed a change to branch development
in repository https://gitbox.apache.org/repos/asf/oodt.git.
from 9e4345a Merge pull request #125 from IMS94/development
new 1790f74 Update changelog with docker deployment
add 683ca23 Merge branch 'development' into oodt-1035
add 5d8c93a Merge branch 'development' into oodt-1035
add f9f5274 Merge branch 'development' into oodt-1035
add 5567cc9 add single product searchbar to product component
add 6eab8be format code
add e56d3f2 remove redundant endpoints and use java file separator
add 362d6a8 improve ui styles and error handling
add 76c906b add missing fmgr endpoints to swagger doc
add 081f6dc fix broken api url environment variables
add e219c60 remove search params from url on new product search
add 7f3dec5 add missing import
add adcf966 fixup! improve ui styles and error handling
add a02d1de remove unused imports and comments and slight style changes
add 983df80 change product list UI and implement product search partially
add 3738860 replace alerts with snackbar messages
add 6988324 fix missing import
add 5563736 replace null checks with stringutils functions
add 0db8e0a use File.separator in ingest methods
add d92a191 reset api url environment variables
add f25b07a use notistack to display notifications
add d25662c search products by product name
add 85d3d64 show product data inside the product browser using a drawer
new 5ad919a Merge branch 'oodt-1035' into development
new 749af12 Updare cors headers and deployment docker profile
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 4 +
deployment/pom.xml | 117 +++++----
.../oodt/cas/filemgr/ingest/StdIngester.java | 6 +-
.../oodt_opsui_sample_app/.env.development | 2 +-
.../oodt_opsui_sample_app/package-lock.json | 28 ++
.../oodt_opsui_sample_app/package.json | 1 +
react-components/oodt_opsui_sample_app/src/App.js | 116 ++++-----
.../src/components/OPSUIHome.js | 33 +--
.../src/components/SearchBar.js | 108 --------
.../src/components/fileManager/Product/Product.js | 142 ++++++-----
.../fileManager/ProductIngest/ProductIngest.js | 88 +++++--
.../ProductIngestWithMetaFile.js | 142 +++++++----
.../fileManager/ProductList/ProductList.js | 283 ++++++++++-----------
.../fileManager/ProductList/SearchBar.js | 159 ++----------
.../fileManager/ProductList/SimpleSnackBar.js | 82 ------
.../src/components/listItems.js | 90 ++-----
.../src/services/fmservice.js | 7 +-
.../oodt_opsui_sample_app/src/utils/utils.js | 12 +
.../swagger-implementations/file_manager.yaml | 23 +-
.../oodt/cas/product/jaxrs/filters/CORSFilter.java | 2 +-
.../jaxrs/services/FileManagerJaxrsServiceV2.java | 82 ++----
.../oodt/cas/wmservices/filters/CORSFilter.java | 2 +-
22 files changed, 639 insertions(+), 890 deletions(-)
delete mode 100644 react-components/oodt_opsui_sample_app/src/components/SearchBar.js
delete mode 100644 react-components/oodt_opsui_sample_app/src/components/fileManager/ProductList/SimpleSnackBar.js
create mode 100644 react-components/oodt_opsui_sample_app/src/utils/utils.js
[oodt] 03/03: Updare cors headers and deployment docker profile
Posted by im...@apache.org.
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 <im...@gmail.com>
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")) {
[oodt] 02/03: Merge branch 'oodt-1035' into development
Posted by im...@apache.org.
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 5ad919a42e9041ff6e7cb740d44c18dca2a9c02c
Merge: 1790f74 85d3d64
Author: Imesha Sudasingha <im...@gmail.com>
AuthorDate: Sat Aug 21 22:43:45 2021 +0530
Merge branch 'oodt-1035' into development
.../oodt/cas/filemgr/ingest/StdIngester.java | 6 +-
.../oodt_opsui_sample_app/.env.development | 2 +-
.../oodt_opsui_sample_app/package-lock.json | 28 ++
.../oodt_opsui_sample_app/package.json | 1 +
react-components/oodt_opsui_sample_app/src/App.js | 116 ++++-----
.../src/components/OPSUIHome.js | 33 +--
.../src/components/SearchBar.js | 108 --------
.../src/components/fileManager/Product/Product.js | 142 ++++++-----
.../fileManager/ProductIngest/ProductIngest.js | 88 +++++--
.../ProductIngestWithMetaFile.js | 142 +++++++----
.../fileManager/ProductList/ProductList.js | 283 ++++++++++-----------
.../fileManager/ProductList/SearchBar.js | 159 ++----------
.../fileManager/ProductList/SimpleSnackBar.js | 82 ------
.../src/components/listItems.js | 90 ++-----
.../src/services/fmservice.js | 7 +-
.../oodt_opsui_sample_app/src/utils/utils.js | 12 +
.../swagger-implementations/file_manager.yaml | 23 +-
.../jaxrs/services/FileManagerJaxrsServiceV2.java | 82 ++----
18 files changed, 572 insertions(+), 832 deletions(-)
[oodt] 01/03: Update changelog with docker deployment
Posted by im...@apache.org.
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 1790f747a5118a2ee014b1934b429bc0242fbdd1
Author: Imesha Sudasingha <im...@gmail.com>
AuthorDate: Sat Aug 21 22:35:54 2021 +0530
Update changelog with docker deployment
---
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.txt b/CHANGES.txt
index 3497fef..88efe57 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Apache OODT Change Log
=======
Release 2.0 - In Progress
+NOTE: Avro RPC becomes the default method of communication from this version. XML RPC is made deprecated.
+
+* OODT-1006 Introduce docker images for file manager, resource manager, ReactJs based OPSUI and file manager/workflow manager REST APIs
+
* OODT-1006 Add Dockerfile for OODT deployment
=======