[airavata-mft] branch master updated (badd42c -> 2a54633)
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
from badd42c consul update to accept all
add 2a54633 Implement dedicated class loaders for transports
No new revisions were added by this update.
Summary of changes:
.gitignore | 3 +-
agent/service/pom.xml | 73 --
.../org/apache/airavata/mft/agent/AppConfig.java | 15 +-
.../org/apache/airavata/mft/agent/MFTAgent.java| 20 ---
.../airavata/mft/agent/TransferOrchestrator.java | 15 +-
.../airavata/mft/agent/TransportMediator.java | 13 +-
.../mft/agent/http/AgentHttpDownloadData.java | 106 --
.../apache/airavata/mft/agent/http/HttpServer.java | 78 --
.../airavata/mft/agent/http/HttpServerHandler.java | 160 -
.../mft/agent/http/HttpServerInitializer.java | 52 ---
.../mft/agent/http/HttpTransferRequestsStore.java | 90
.../mft/agent/ingress/ConsulIngressHandler.java| 7 +-
.../apache/airavata/mft/agent/rpc/RPCParser.java | 18 ++-
.../mft/agent/transport}/ConnectorResolver.java| 22 +--
.../transport}/MetadataCollectorResolver.java | 8 +-
.../mft/agent/transport/TransportClassLoader.java | 119 +++
.../agent/transport/TransportClassLoaderCache.java | 45 ++
.../main/resources/agent-application.properties| 3 +-
.../apache/airavata/mft/core/ResourceTypes.java| 23 ---
pom.xml| 2 +
python-cli/mft_cli/airavata_mft_cli/config.py | 4 +-
standalone-service/pom.xml | 1 -
.../server/StandaloneServiceApplication.java | 6 -
.../src/main/resources/application.properties | 7 +-
transport/azure-transport/pom.xml | 46 ++
.../src/main/assembly/transport-assembly.xml | 39 +
transport/box-transport/pom.xml| 45 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/dropbox-transport/pom.xml| 45 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/ftp-transport/pom.xml| 45 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/gcp-transport/pom.xml| 46 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/local-transport/pom.xml | 46 +-
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/odata-transport/pom.xml | 46 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/s3-transport/pom.xml | 46 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/scp-transport/pom.xml| 45 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
transport/swift-transport/pom.xml | 46 ++
.../src/main/assembly/transport-assembly.xml | 40 +-
44 files changed, 706 insertions(+), 1039 deletions(-)
delete mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/http/AgentHttpDownloadData.java
delete mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/http/HttpServer.java
delete mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/http/HttpServerHandler.java
delete mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/http/HttpServerInitializer.java
delete mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequestsStore.java
rename {core/src/main/java/org/apache/airavata/mft/core =>
agent/service/src/main/java/org/apache/airavata/mft/agent/transport}/ConnectorResolver.java
(80%)
rename {core/src/main/java/org/apache/airavata/mft/core =>
agent/service/src/main/java/org/apache/airavata/mft/agent/transport}/MetadataCollectorResolver.java
(89%)
create mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/transport/TransportClassLoader.java
create mode 100644
agent/service/src/main/java/org/apache/airavata/mft/agent/transport/TransportClassLoaderCache.java
delete mode 100644
core/src/main/java/org/apache/airavata/mft/core/ResourceTypes.java
copy agent/service/src/main/assembly/agent-bin-assembly.xml =>
transport/azure-transport/src/main/assembly/transport-assembly.xml (60%)
copy agent/service/src/main/assembly/agent-bin-assembly.xml =>
transport/box-transport/src/main/assembly/transport-assembly.xml (60%)
copy agent/service/src/main/assembly/agent-bin-assembly.xml =>
transport/dropbox-transport/src/main/assembly/transport-assembly.xml (60%)
copy agent/service/src/main/assembly/agent-bin-assembly.xml =>
transport/ftp-transport/src/main/assembly/transport-assembly.xml
[airavata-data-catalog] branch main updated: handled data product not existing scenario
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airavata-data-catalog.git
The following commit(s) were added to refs/heads/main by this push:
new 60901b5 handled data product not existing scenario
new 5596701 Merge pull request #21 from lahirujayathilake/main
60901b5 is described below
commit 60901b5fbe44e8551fc9f421164d99f7695969ae
Author: Lahiru Jayathilake
AuthorDate: Sat Mar 11 16:17:00 2023 +0530
handled data product not existing scenario
---
.../datacatalog/api/mapper/DataProductMapper.java | 8 ++--
.../api/repository/DataProductRepository.java | 4 +-
.../api/service/DataCatalogAPIService.java | 49 +++---
.../api/service/impl/DataCatalogServiceImpl.java | 18
4 files changed, 53 insertions(+), 26 deletions(-)
diff --git
a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/mapper/DataProductMapper.java
b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/mapper/DataProductMapper.java
index bc8ad22..82b17f7 100644
---
a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/mapper/DataProductMapper.java
+++
b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/mapper/DataProductMapper.java
@@ -1,6 +1,7 @@
package org.apache.airavata.datacatalog.api.mapper;
import org.apache.airavata.datacatalog.api.DataProduct;
+import org.apache.airavata.datacatalog.api.exception.EntityNotFoundException;
import org.apache.airavata.datacatalog.api.model.DataProductEntity;
import org.apache.airavata.datacatalog.api.model.MetadataSchemaEntity;
import org.apache.airavata.datacatalog.api.repository.DataProductRepository;
@@ -30,10 +31,11 @@ public class DataProductMapper {
dataProductEntity.setName(dataProduct.getName());
-if (dataProduct.hasParentDataProductId()) {
-// TODO: handle parent data product not found
+if (dataProduct.hasParentDataProductId() &&
!dataProduct.getParentDataProductId().isEmpty()) {
DataProductEntity parentDataProductEntity = dataProductRepository
-.findByExternalId(dataProduct.getParentDataProductId());
+.findByExternalId(dataProduct.getParentDataProductId())
+.orElseThrow(() -> new EntityNotFoundException("Could not
find the parent data product with the ID: "
++ dataProduct.getParentDataProductId()));
dataProductEntity.setParentDataProductEntity(parentDataProductEntity);
}
if (dataProduct.hasMetadata()) {
diff --git
a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/DataProductRepository.java
b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/DataProductRepository.java
index 426e4d4..64747b2 100644
---
a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/DataProductRepository.java
+++
b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/repository/DataProductRepository.java
@@ -4,10 +4,12 @@ import
org.apache.airavata.datacatalog.api.model.DataProductEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Optional;
+
@Transactional(readOnly = true)
public interface DataProductRepository extends
JpaRepository {
-DataProductEntity findByExternalId(String externalId);
+Optional findByExternalId(String externalId);
@Transactional
void deleteByExternalId(String externalId);
diff --git
a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java
b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java
index b5686a2..e4e4794 100644
---
a/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java
+++
b/data-catalog-api/server/src/main/java/org/apache/airavata/datacatalog/api/service/DataCatalogAPIService.java
@@ -68,19 +68,29 @@ public class DataCatalogAPIService extends
DataCatalogAPIServiceGrpc.DataCatalog
StreamObserver responseObserver) {
// TODO: check that user has access to update data product record
-DataProduct savedDataProduct =
dataCatalogService.updateDataProduct(request.getDataProduct());
+try {
+DataProduct savedDataProduct =
dataCatalogService.updateDataProduct(request.getDataProduct());
-
responseObserver.onNext(DataProductUpdateResponse.newBuilder().setDataProduct(savedDataProduct).build());
-responseObserver.onCompleted();
+
responseObserver.onNext(DataProductUpdateResponse.newBuilder().setDataProduct(savedDataProduct).build());
+
[airavata-custos] branch baremetal updated: Adding README
This is an automated email from the ASF dual-hosted git repository. isjarana pushed a commit to branch baremetal in repository https://gitbox.apache.org/repos/asf/airavata-custos.git The following commit(s) were added to refs/heads/baremetal by this push: new d812230b4 Adding README new 82e98d628 Merge pull request #366 from isururanawaka/ide-integration d812230b4 is described below commit d812230b43f87a86fffa6a38fe46ab1bd4449e82 Author: Isuru Ranawaka AuthorDate: Mon Mar 20 09:07:35 2023 -0400 Adding README --- README.md | 44 +++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d83cbb1e..3e709ebda 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,51 @@ Science gateways represent potential targets for cybersecurity threats to users, ## Quickstart - ## Installation Instructions +### Deploy Custos on remote server +### Setup Custos for local development +* Clone the repository + ``` +git clone -b develop https://github.com/apache/airavata-custos.git + + ``` + +* Build source code + + Following command builds the Custos source code and create two docker images of custos_core_server and custos_integration_server + + ``` +cd airavata-custos +mvn clean install + ``` + +* Run Custos on docker + +Following command starts Custos main services and its depend services + - Dependent Services +* Keycloak +* MySQL +* HashiCorp Vault + + - Custos Services +* Custos Core Service +* Custos Integration Service +* Custos Rest Proxy + + ``` + cd custos-utilities/ide-integration/src/main/containers + docker-compose up + ``` +* Bootstrapping Custos + + If all services were successfully ran. Custos bootstrap service needs to be run to create the Super tenant to launch Custos Portal + ``` +cd custos-utilities/custos-bootstrap-service/ +mvn spring-boot:run + ``` +The above command should create the super tenant and it outputs super tenant credentials. Copy those credentials to configure +Custos Portal. ## Roadmap ## Contributing
[airavata-custos] branch baremetal updated: Remove unnecassary files
This is an automated email from the ASF dual-hosted git repository. isjarana pushed a commit to branch baremetal in repository https://gitbox.apache.org/repos/asf/airavata-custos.git The following commit(s) were added to refs/heads/baremetal by this push: new c67a03aa8 Remove unnecassary files new e2b5da5bc Merge pull request #365 from isururanawaka/ide-integration c67a03aa8 is described below commit c67a03aa89c291a08db719d401a697a178c1b166 Author: Isuru Ranawaka AuthorDate: Mon Mar 20 08:06:01 2023 -0400 Remove unnecassary files --- README.md | 1 + keycloak-client-truststore.pkcs12 |Bin 1718 -> 0 bytes results.txt. | 54 --- vault-client-truststore.pkcs12|Bin 1718 -> 0 bytes 4 files changed, 1 insertion(+), 54 deletions(-) diff --git a/README.md b/README.md index d8f16eee2..7d83cbb1e 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Science gateways represent potential targets for cybersecurity threats to users, ## Quickstart + ## Installation Instructions ## Roadmap diff --git a/keycloak-client-truststore.pkcs12 b/keycloak-client-truststore.pkcs12 deleted file mode 100644 index 06eca9e99..0 Binary files a/keycloak-client-truststore.pkcs12 and /dev/null differ diff --git a/results.txt. b/results.txt. deleted file mode 100644 index 610f8138a..0 --- a/results.txt. +++ /dev/null @@ -1,54 +0,0 @@ -3 10005 -3 10523 -3 10541 -3 19 -3 2263 -3 10293 -3 5673 -3 13701 -3 13618 -5 46 -5 1287 -5 601 -5 184 -5 708 -5 268 -5 3848 -5 384 -5 177 -7 5305 -7 4752 -7 4776 -7 2433 -7 9488 -7 10557 -7 5257 -7 4862 -7 13161 -9 6699 -9 2261 -9 9261 -9 5851 -9 5865 -9 1545 -9 7241 -9 6559 -9 2013 -13 299 -13 4492 -13 9521 -13 753 -13 22895 -13 491 -13 9512 -13 11170 -13 4237 -20 10060 -20 11216 -20 11226 -20 7499 -20 729 -20 11178 -20 755 -20 10511 -20 1193 -22 120 -22 640 -22 2 -22 5286 -22 5616 -22 670 -22 10324 -22 5054 -22 4952 -25 1486 -25 133 -25 1529 -25 411 -25 922 -25 286 -25 3828 -25 1126 -25 740 -28 1844 -28 3656 -28 12528 -28 7636 -28 910 -28 243 -28 150 -28 12266 -28 896 -29 1423 -29 8070 -29 1590 -29 7914 -29 1674 -29 8168 -29 7751 -29 7944 -29 5627 -31 249 -31 501 -31 1193 -31 407 -31 1453 -31 739 -31 9 -31 105 -31 201 -32 8182 -32 2512 -32 3514 -32 2414 -32 5184 -32 3631 -32 22287 -32 3300 -32 8772 -41 3605 -41 3715 -41 3419 -41 839 -41 11179 -41 11413 -41 113 -41 10893 -41 9679 -44 1251 -44 442 -44 7937 -44 196 -44 10598 -44 259 -44 708 -44 7728 -44 10622 -46 8016 -46 13396 -46 184 -46 12670 -46 708 -46 10622 -46 10952 -46 5 -46 11126 -52 5109 -52 13875 -52 3830 -52 1387 -52 4289 -52 5287 -52 5121 -52 4986 -52 1041 -53 10389 -53 372 -53 9989 -53 10497 -53 447 -53 13699 -53 3805 -53 325 -53 8488 -55 8515 -55 14944 -55 8038 -55 268 -55 3698 -55 8469 -55 1217 -55 7900 -55 9277 -57 230 -57 527 -57 6445 -57 89 -57 3810 -57 250 -57 6147 -57 210 -57 207 -58 10172 -58 10078 -58 11226 -58 11124 -58 11140 -58 11216 -58 5717 -58 13768 -58 10411 -60 3730 -60 11562 -60 9394 -60 5682 -60 872 -60 5246 -60 920 -60 748 -60 17226 -62 11710 -62 17261 -62 17419 -62 4206 -62 24 -62 8186 -62 2427 -62 5169 -62 5190 -65 1361 -65 9149 -65 8097 -65 1347 -65 3815 -65 678 -65 9234 -65 10773 -65 682 -66 10174 -66 10654 -66 192 -66 17462 -66 3357 -66 2552 -66 146 -66 916 -66 4962 -68 9988 -68 1119 -68 10660 -68 11062 -68 10948 -68 11136 -68 11158 -68 232 -68 10414 -69 985 -69 1615 -69 1591 -69 4485 -69 1533 -69 647 -69 1331 -69 1191 -69 4065 -71 10379 -71 6437 -71 1549 -71 1085 -71 6117 -71 451 -71 10363 -71 201 -71 383 -73 11279 -73 3227 -73 3213 -73 367 -73 2971 -73 11419 -73 7939 -73 12706 -73 3231 -76 5328 -76 5698 -76 1908 -76 850 -76 670 -76 70 -76 690 -76 640 -76 5889 -78 11094 -78 11562 -78 11206 -78 872 -78 11108 -78 1212 -78 3734 -78 9405 -78 11136 -79 417 -79 3964 -79 3798 -79 100 -79 1628 -79 3832 -79 310 -79 3972 -79 356 -80 142 -80 72 -80 7770 -80 7738 -80 16 -80 8322 -80 8288 -80 596 -80 7644 -82 3260 -82 2562 -82 980 -82 2945 -82 452 -82 3087 -82 2959 -82 3249 -82 1046 -85 10325 -85 5101 -85 13755 -85 13768 -85 10829 -85 10078 -85 4605 -85 13806 -85 9199 -87 10677 -87 7667 -87 10239 -87 10287 -87 13737 -87 11075 -87 5959 -87 10317 -87 10999 -89 6147 -89 210 -89 3810 -89 7359 -89 6615 -89 12653 -89 6395 -89 57 -89 3830 -90 7750 -90 13554 -90 8318 -90 8400 -90 7704 -90 8342 -90 13988 -90 116 -90 1488 -92 10594 -92 5658 -92 10760 -92 8168 -92 7644 -92 10764 -92 11050 -92 10728 -92 8268 -95 14942 -95 14976 -95 14924 -95 5336 -95 1476 -95 5211 -95 5044 -95 225 -95 390 -97 1900 -97 11908 -97 2056 -97 655 -97 637 -97 43 -97 1849 -97 3751 -97 12679 -98 5776 -98 5784 -98 56 -98 4670 -98 4449 -98 9350 -98 8392 -98 8723 -98 4522 -100 3488 -100 10008 -100 1628 -100 456 -100 3798 -100 1096 -100 11263 -100 3772 -100 12242 -103 1823 -103 12591 -103 18443 -103 12155 -103 12057 -103 12383 -103 15 -103 12633 -103 12706 -104 1748 -104 5658 -104 7946 -104 11236 -104 1620 -104 1674
[airavata] branch master updated: Adding Citation Info
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/master by this push: new 03175bd669 Adding Citation Info 03175bd669 is described below commit 03175bd669150b83a6869327dcfd3d7afadddeaa Author: Suresh Marru AuthorDate: Mon Mar 20 06:33:56 2023 -0400 Adding Citation Info Addressing issue #AIRAVATA-3690 --- CITATION.cff | 56 1 file changed, 56 insertions(+) diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00..92f4e125cc --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,56 @@ +# This CITATION.cff file was generated with cffinit. +# Visit https://bit.ly/cffinit to generate yours today! + +cff-version: 1.2.0 +title: Apache Airavata +message: >- + If you use this software, please cite it using the + metadata from this file. +type: software +authors: + - given-names: Airavata +family-names: Apache +email: d...@airavata.apache.org +repository-code: 'https://github.com/apache/airavata' +url: 'https://airavata.apache.org/' +license: Apache-2.0 +preferred-citation: + type: proceedings + authors: + - family-names: "Marru" +given-names: "Suresh" + - family-names: "Gunathilake" +given-names: "Lahiru" + - family-names: "Herath" +given-names: "Chathura" + - family-names: "Tangchaisin" +given-names: "Patanachai" + - family-names: "Pierce" +given-names: "Marlon" + - family-names: "Mattmann" +given-names: "Chris" + - family-names: "Singh" +given-names: "Raminder" + - family-names: "Gunarathne" +given-names: "Thilina" + - family-names: "Chinthaka" +given-names: "Eran" + - family-names: "Gardler" +given-names: "Ross" + - family-names: "Slominski" +given-names: "Aleksander" + - family-names: "Douma" +given-names: "Ate" + - family-names: "Perera" +given-names: "Srinath" + - family-names: "Weerawarana" +given-names: "Sanjiva" + doi: "10.1145/2110486.2110490" + journal: "Proceedings of the 2011 ACM workshop on Gateway computing environments" + month: 11 + start: 1 # 21 + end: 10 # 28 + title: "Apache airavata: a framework for distributed applications and computational workflows" + issue: 1 + volume: 1 + year: 2011
