(airavata-cerebrum) branch main updated: Create .asf.yaml
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cerebrum.git The following commit(s) were added to refs/heads/main by this push: new 302dafb Create .asf.yaml 302dafb is described below commit 302dafb6ca2178e89f5cbaf96f28b2810f7b4d4a Author: Suresh Marru AuthorDate: Tue Jan 23 18:51:44 2024 -0500 Create .asf.yaml Triggering issues and projects --- .asf.yaml | 42 ++ 1 file changed, 42 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..24a6fc5 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,42 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +notifications: + commits: commits@airavata.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@airavata.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: iss...@airavata.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@airavata.apache.org + +github: + description: "Apache Airavata Cerebrum" + homepage: https://airavata.apache.org/custos + labels: +- airavata +- apache +- cerebrum +- neuroscience +- brain atlases +- computational + + features: +wiki: false +issues: true +projects: true
(airavata-cerebrum) branch main created (now 4ac068b)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cerebrum.git at 4ac068b bootstrapping the repo This branch includes the following new commits: new 4ac068b bootstrapping the repo The 1 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.
(airavata-cerebrum) 01/01: bootstrapping the repo
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/airavata-cerebrum.git commit 4ac068b5dc84a432d6602936763dcd8ae9ad9991 Author: Suresh Marru AuthorDate: Tue Nov 28 08:24:52 2023 -0500 bootstrapping the repo Intro readme --- README.md | 12 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..a720ab6 --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# Apache Airavata Cerebrum, an Integrated Neuroscience Computational Framework + +## Introduction + +Welcome to the Apache Airavata Cerebrum repository for the Integrated Neuroscience Computational Framework. This project aims to revolutionize how we understand and model the human brain by integrating cellular-level brain atlases with advanced computational tools. Our goal is to create a cohesive, open-source framework that allows for the seamless application of existing tools within a streamlined, lightweight environment. + +## Features + +- **Integration of Brain Atlases**: Merging publicly available cellular-level brain atlases into a single, accessible platform. +- **Comprehensive Modeling Tools**: Incorporating computational tools designed for modeling the entire brain. +- **Open-Source Framework**: Developing a user-friendly, open-source environment for neuroscience research. +- **Streamlined Environment**: Ensuring a lightweight, efficient framework for both beginners and advanced users.
[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
[airavata-data-catalog] branch main updated: Adding the mandatory LICENSE and NOTICE files
This is an automated email from the ASF dual-hosted git repository. smarru 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 0265694 Adding the mandatory LICENSE and NOTICE files 0265694 is described below commit 0265694ad0eaa3098c358e12ac534e20bd6f031d Author: Suresh Marru AuthorDate: Thu Feb 2 11:47:15 2023 -0500 Adding the mandatory LICENSE and NOTICE files --- LICENSE | 202 NOTICE | 5 ++ 2 files changed, 207 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..7a4a3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each
[airavata-mft] branch master updated: Adding NOTICE file
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-mft.git The following commit(s) were added to refs/heads/master by this push: new 899f3ad Adding NOTICE file 899f3ad is described below commit 899f3adb31c1fa89106da74d2a59ac95f6f73ddc Author: Suresh Marru AuthorDate: Thu Feb 2 11:40:51 2023 -0500 Adding NOTICE file --- NOTICE | 5 + 1 file changed, 5 insertions(+) diff --git a/NOTICE b/NOTICE new file mode 100644 index 000..1204a42 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Airavata MFT +Copyright 2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file
[airavata-mft] branch master updated: removing travis build
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-mft.git The following commit(s) were added to refs/heads/master by this push: new 06dcc30 removing travis build 06dcc30 is described below commit 06dcc304160b3c2e5b0af50f83d9582e17ea9017 Author: Suresh Marru AuthorDate: Tue Jan 31 09:55:56 2023 -0500 removing travis build --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 1249f35..5b0b0b1 100755 --- a/README.md +++ b/README.md @@ -17,9 +17,6 @@ specific language governing permissions and limitations under the License. --> -[![Build Status](https://travis-ci.org/apache/airavata-mft.svg?branch=master)](https://travis-ci.org/apache/airavata-mft) - - # Airavata Managed File Transfers (MFT) Apache Airavata MFT is a high-performance, multi-protocol data transfer engine to orchestrate data movement and operations across most cloud and On-premises storages. MFT aims to abstract the complexity of heterogenous storages by providing a unified and simple interface for users to seamlessly access and move data across any storage endpoint. To accomplish this goal, MFT provides simple but highly-performing tools to access most cloud and on-premise storages as seamlessly as they access [...]
[airavata-mft] branch master updated: word smithing readme
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-mft.git The following commit(s) were added to refs/heads/master by this push: new 5543fbe word smithing readme 5543fbe is described below commit 5543fbe0f0e8084f25b41a0826a508fcf97d453b Author: Suresh Marru AuthorDate: Tue Jan 31 09:52:21 2023 -0500 word smithing readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee2ab52..1249f35 100755 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ under the License. # Airavata Managed File Transfers (MFT) -Apache Airavata MFT is a high-performance, multi-protocol data transfer engine to orchestrate data movement and operations across most cloud and legacy storage endpoints. Airavata MFT provides simple but highly-performing tools to access most cloud and on-premise storages as seamlessly as they access local files in their workstations. +Apache Airavata MFT is a high-performance, multi-protocol data transfer engine to orchestrate data movement and operations across most cloud and On-premises storages. MFT aims to abstract the complexity of heterogenous storages by providing a unified and simple interface for users to seamlessly access and move data across any storage endpoint. To accomplish this goal, MFT provides simple but highly-performing tools to access most cloud and on-premise storages as seamlessly as they access [...] -Airavata MFT abstracts out the complexity of each storage type and provides a unified and simple interface for users to access and move data across any endpoint seamlessly. Airavata MFT bundles easily deployable agents which auto determine optimum network path with additional multi-channel, parallel data paths to optimize the transfer performance to gain the maximum throughput between storage endpoints. MFT utilizes parallel Agents to transfer data between endpoints to gain the advantage [...] +Apache Airavata MFT bundles easily deployable agents that auto determine optimum network path with additional multi-channel, parallel data paths to optimize the transfer performance to gain the maximum throughput between storage endpoints. MFT utilizes parallel Agents to transfer data between endpoints to gain the advantage of multiple network links. # Try Airavata MFT MFT requires Java 11+ and python3.10+ to install Airavata MFT in your environment. MFT currently supports Linux and MacOS operating systems. Contributions to support Windows are welcome!!.
[airavata-mft] branch master updated: README improvements
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-mft.git The following commit(s) were added to refs/heads/master by this push: new b44a1bc README improvements b44a1bc is described below commit b44a1bc6c32dd3f9ec7622569a648462aa75763c Author: Suresh Marru AuthorDate: Mon Jan 30 17:27:41 2023 -0500 README improvements --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 52b3bb2..ee2ab52 100755 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ under the License. # Airavata Managed File Transfers (MFT) -Airavata MFT is a high-performance, multi-protocol data transfer engine developed for orchestrating data movement and operations across most of the cloud and legacy storage endpoints. Through Airavata MFT, our vision is to provide simple but highly performing tools for users to access any cloud or on-premise storage endpoint just as they access local files in their workstations. +Apache Airavata MFT is a high-performance, multi-protocol data transfer engine to orchestrate data movement and operations across most cloud and legacy storage endpoints. Airavata MFT provides simple but highly-performing tools to access most cloud and on-premise storages as seamlessly as they access local files in their workstations. -Airavata MFT abstracts out the complexity of each storage type and provides a unified and simple interface for users to access and move data across any endpoint seamlessly. To gain the maximum throughput between storage endpoints, Airavata MFT utilizes Agents installed between the optimum network path with additional multi-channel, parallel data paths to further optimize the transfer performance. In addition to that, MFT can utilize parallel Agents to transfer data between endpoints to g [...] +Airavata MFT abstracts out the complexity of each storage type and provides a unified and simple interface for users to access and move data across any endpoint seamlessly. Airavata MFT bundles easily deployable agents which auto determine optimum network path with additional multi-channel, parallel data paths to optimize the transfer performance to gain the maximum throughput between storage endpoints. MFT utilizes parallel Agents to transfer data between endpoints to gain the advantage [...] # Try Airavata MFT -You need to have Java 11+ and python3.10+ installed to install Airavata MFT in your environment. We currently only support Linux and MacOS operating systems and plan to support Windows in future. +MFT requires Java 11+ and python3.10+ to install Airavata MFT in your environment. MFT currently supports Linux and MacOS operating systems. Contributions to support Windows are welcome!!. ### Download and Install
[airavata-mft] branch master updated (374b82b -> a3e1f9d)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git from 374b82b missing license headers add a3e1f9d adding auto-generated changelog No new revisions were added by this update. Summary of changes: CHANGELOG.md | 71 +++ pom.xml | 5 -- python-sdk/samples/sample.py | 18 ++ python-sdk/setup.cfg | 16 + python-sdk/src/airavata_mft_sdk/generate-stubs.sh | 17 ++ 5 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 CHANGELOG.md
[airavata-mft] branch master updated: missing license headers
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-mft.git The following commit(s) were added to refs/heads/master by this push: new 374b82b missing license headers 374b82b is described below commit 374b82ba6f0d1738a1b088b092662b802878ac85 Author: Suresh Marru AuthorDate: Thu Jan 26 11:04:47 2023 -0500 missing license headers --- .../airavata/mft/command/line/CommandLineUtil.java | 17 + .../airavata/mft/command/line/MainRunner.java | 17 + .../mft/command/line/sub/s3/S3SubCommand.java | 17 + .../line/sub/s3/storage/S3StorageAddSubCommand.java | 17 + .../line/sub/s3/storage/S3StorageSubCommand.java| 17 + .../command/line/sub/swift/SwiftAddSubCommand.java | 17 + .../line/sub/swift/SwiftRemoteSubCommand.java | 17 + .../mft/command/line/sub/swift/SwiftSubCommand.java | 17 + .../line/sub/transfer/SubmitTransferSubCommand.java | 17 + .../line/sub/transfer/TransferStateSubCommand.java | 17 + .../line/sub/transfer/TransferSubCommand.java | 17 + .../airavata/mft/controller/RequestBuilder.java | 17 + .../mft/resource/client/StorageServiceClient.java | 17 + .../client/StorageServiceClientBuilder.java | 17 + .../backend/sql/entity/GenericResourceEntity.java | 17 + .../backend/sql/entity/LocalStorageEntity.java | 17 + .../server/backend/sql/entity/S3StorageEntity.java | 17 + .../backend/sql/entity/StorageSecretEntity.java | 17 + .../sql/repository/GenericResourceRepository.java | 17 + .../sql/repository/LocalStorageRepository.java | 17 + .../backend/sql/repository/S3StorageRepository.java | 17 + .../sql/repository/StorageSecretRepository.java | 17 + .../src/main/resources/applicationContext.xml | 21 + .../distribution/conf/applicationContext.xml| 21 + .../server/backend/sql/entity/S3SecretEntity.java | 17 + .../backend/sql/repository/S3SecretRepository.java | 17 + .../secret/server/handler/SwiftServiceHandler.java | 17 + .../src/main/resources/applicationContext.xml | 21 + .../distribution/conf/applicationContext.xml| 21 + .../server/src/main/resources/secrets.json.template | 16 .../server/StandaloneServiceApplication.java| 17 + .../src/main/resources/application.properties | 17 - .../gcp/GCSOutgoingStreamingConnector.java | 17 + .../src/main/resources/application.properties | 17 - transport/local-transport/pom.xml | 21 + .../mft/transport/s3/S3IncomingConnector.java | 17 + .../mft/transport/s3/S3OutgoingConnector.java | 17 + transport/swift-transport/pom.xml | 21 + 38 files changed, 667 insertions(+), 2 deletions(-) diff --git a/command-line/src/main/java/org/apache/airavata/mft/command/line/CommandLineUtil.java b/command-line/src/main/java/org/apache/airavata/mft/command/line/CommandLineUtil.java index 44efeb5..9a8446c 100644 --- a/command-line/src/main/java/org/apache/airavata/mft/command/line/CommandLineUtil.java +++ b/command-line/src/main/java/org/apache/airavata/mft/command/line/CommandLineUtil.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.airavata.mft.command.line; public final class CommandLineUtil { diff --git a/command-line/src/main/java/org/apache/airavata/mft/command/line/MainRunner.java b/command-line/src/main/java/org/apache/airavata/mft/command/line/MainRunner.java index 0a6764b..355acb8 100644 --- a/comman
[airavata-mft] branch master updated (a6ec115 -> 55681df)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git from a6ec115 adding git ignore add 55681df adding missing license headers No new revisions were added by this update. Summary of changes: .github/ISSUE_TEMPLATE/bug_report.md| 19 +++ .github/ISSUE_TEMPLATE/cleanup_request.md | 18 ++ .github/ISSUE_TEMPLATE/feature_request.md | 19 +++ agent/stub/pom.xml | 21 + api/stub/src/main/proto/MFTTransferApi.proto| 17 + common/mft-common-proto/pom.xml | 21 + common/pom.xml | 2 +- .../airavata/mft/core/DoubleStreamingBuffer.java| 17 + .../airavata/mft/core/api/BasicConnector.java | 17 + .../airavata/mft/core/api/ConnectorConfig.java | 17 + .../mft/core/api/IncomingChunkedConnector.java | 17 + .../mft/core/api/OutgoingChunkedConnector.java | 17 + .../mft/core/CircularStreamingBufferTest2.java | 17 + pom.xml | 5 + python-cli/mft_cli/README.md| 19 +++ python-cli/mft_cli/airavata_mft_cli/__init__.py | 18 ++ python-cli/mft_cli/airavata_mft_cli/base.py | 18 ++ python-cli/mft_cli/airavata_mft_cli/bootstrap.py| 18 ++ python-cli/mft_cli/airavata_mft_cli/main.py | 18 ++ python-cli/mft_cli/airavata_mft_cli/operations.py | 18 ++ .../mft_cli/airavata_mft_cli/storage/__init__.py| 18 ++ .../mft_cli/airavata_mft_cli/storage/azure.py | 18 ++ python-cli/mft_cli/airavata_mft_cli/storage/s3.py | 18 ++ 23 files changed, 386 insertions(+), 1 deletion(-)
[airavata-mft] branch master updated: adding git ignore
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-mft.git The following commit(s) were added to refs/heads/master by this push: new a6ec115 adding git ignore a6ec115 is described below commit a6ec1155d3fe02a1a0206990316017715d7cd7a4 Author: Suresh Marru AuthorDate: Tue Jan 24 23:42:43 2023 -0500 adding git ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d43a85d..9729373 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,7 @@ dkms.conf ### Code ### .vscode/* -!.vscode/settings.json +.vscode/settings.json !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json
[airavata] branch develop updated: Reming travis file as we move to github actions
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/develop by this push: new 2feb3e2485 Reming travis file as we move to github actions 2feb3e2485 is described below commit 2feb3e2485857e9833682227ebc342f7d36536b5 Author: Suresh Marru AuthorDate: Wed Jan 25 17:08:11 2023 -0500 Reming travis file as we move to github actions --- .travis.yml | 37 - 1 file changed, 37 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 21894a577f..00 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -language: java - -sudo: false - -notifications: - email: -on_success: change -on_failure: always - -jdk: - - oraclejdk11 - -script: mvn clean install - -# Git-describe Maven plugin needs the full history -git: - depth: false
[airavata-mft] branch master updated: more license headers
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-mft.git The following commit(s) were added to refs/heads/master by this push: new 16c2bf0 more license headers 16c2bf0 is described below commit 16c2bf0382d5208bed056357be509052c9087025 Author: Suresh Marru AuthorDate: Tue Jan 24 23:40:37 2023 -0500 more license headers --- docker/Dockerfile | 18 ++ docker/docker-compose.yml | 18 ++ python-cli/mft_cli/pyproject.toml | 20 +++- python-sdk/pyproject.toml | 18 ++ 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9d29348..6faf10e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,3 +1,21 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + FROM maven:3.8.6-jdk-11 RUN apt-get update -y diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3e12e93..124b730 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,3 +1,21 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + version: '3.8' services: diff --git a/python-cli/mft_cli/pyproject.toml b/python-cli/mft_cli/pyproject.toml index 3bf7e17..149b192 100644 --- a/python-cli/mft_cli/pyproject.toml +++ b/python-cli/mft_cli/pyproject.toml @@ -1,8 +1,26 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [tool.poetry] name = "airavata-mft-cli" version = "0.1.3" description = "Command Line Client for Airavata MFT data transfer framework" -authors = ["Dimuthu Wannipurage "] +authors = ["Apache Airavata http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [build-system] requires = ["setuptools>=42", "grpcio==1.46.3", "grpcio-tools==1.46.3"] build-backend = "setuptools.build_meta" \ No newline at end of file
[airavata-mft] 01/02: Removing the accidental file commit
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-mft.git commit 127e9b74acdbdbd25fc3be00a1b62058ab68a492 Author: Suresh Marru AuthorDate: Tue Jan 24 22:12:15 2023 -0500 Removing the accidental file commit --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index e0f15db..000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ -"java.configuration.updateBuildConfiguration": "automatic" -} \ No newline at end of file
[airavata-mft] branch master updated (9a5ff34 -> 006b108)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git from 9a5ff34 rat plugin to check for ASF release complaince new 127e9b7 Removing the accidental file commit new 006b108 adding license headers The 2 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: .vscode/settings.json| 3 --- README.md| 19 +++ docker/Readme.md | 19 +++ python-cli/README.md | 19 +++ python-sdk/README.md | 19 +++ python-sdk/samples/README.md | 19 +++ 6 files changed, 95 insertions(+), 3 deletions(-) delete mode 100644 .vscode/settings.json
[airavata-mft] 02/02: adding license headers
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-mft.git commit 006b108a98dc2f32c03a3b9016e1d8b5a6d3483f Author: Suresh Marru AuthorDate: Tue Jan 24 22:31:23 2023 -0500 adding license headers --- README.md| 19 +++ docker/Readme.md | 19 +++ python-cli/README.md | 19 +++ python-sdk/README.md | 19 +++ python-sdk/samples/README.md | 19 +++ 5 files changed, 95 insertions(+) diff --git a/README.md b/README.md index 646e8cc..9b8ee37 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,22 @@ + + [![Build Status](https://travis-ci.org/apache/airavata-mft.svg?branch=master)](https://travis-ci.org/apache/airavata-mft) diff --git a/docker/Readme.md b/docker/Readme.md index 912dca7..3083f7d 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -1,3 +1,22 @@ + + ## Build and run airavata-mft as a docker container Build the docker image from the directory containing the Dockerfile: diff --git a/python-cli/README.md b/python-cli/README.md index 7973f73..b941fe5 100644 --- a/python-cli/README.md +++ b/python-cli/README.md @@ -1,3 +1,22 @@ + + ### MFT-Cli Build Instructions Install Poetry diff --git a/python-sdk/README.md b/python-sdk/README.md index e927fcd..bb23034 100644 --- a/python-sdk/README.md +++ b/python-sdk/README.md @@ -1,3 +1,22 @@ + + ### Generate Protobuf / Grpc sources ``` diff --git a/python-sdk/samples/README.md b/python-sdk/samples/README.md index ba74dae..9065b23 100644 --- a/python-sdk/samples/README.md +++ b/python-sdk/samples/README.md @@ -1,3 +1,22 @@ + + ### Instructions to run samples * Start MFT Components
[airavata-mft] branch master updated (1244f23 -> 9a5ff34)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git from 1244f23 Bootstrapping MFT from command line with standalone mode add 9a5ff34 rat plugin to check for ASF release complaince No new revisions were added by this update. Summary of changes: .vscode/settings.json | 3 +++ pom.xml | 15 ++- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 .vscode/settings.json
[airavata-django-portal] branch master updated: adding metadata file
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-django-portal.git The following commit(s) were added to refs/heads/master by this push: new c5041512 adding metadata file c5041512 is described below commit c5041512fab88e12ee70e9815650aeff2aa004e2 Author: Suresh Marru AuthorDate: Sat Jan 7 03:05:58 2023 -0500 adding metadata file --- .asf.yaml | 40 1 file changed, 40 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index ..efb24e39 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,40 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +notifications: + commits: commits@airavata.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@airavata.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: cus...@airavata.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@airavata.apache.org + +github: + description: "Apache Airavata Django Portal Framework" + homepage: https://airavata.apache.org/ + labels: +- airavata +- sciencegateways +- gateways +- cloudnative +- microservices +- java +- workfloworchestrator +- workflow +- bigdata
[airavata-sandbox] branch master updated: adding ASF metadata file
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-sandbox.git The following commit(s) were added to refs/heads/master by this push: new 4c749577 adding ASF metadata file 4c749577 is described below commit 4c749577d18235632d5e2f15126360fc624cb5f8 Author: Suresh Marru AuthorDate: Thu Jan 5 22:38:02 2023 -0500 adding ASF metadata file --- .asf.yaml | 41 + 1 file changed, 41 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index ..48a8ed1f --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,41 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +notifications: + commits: commits@airavata.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@airavata.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: cus...@airavata.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@airavata.apache.org + +github: + description: "Sanbox repository for explaratory Apache Airavata features" + homepage: https://airavata.apache.org/ + labels: +- airavata +- sciencegateways +- gateways +- cloudnative +- microservices +- java +- workfloworchestrator +- workflow +- bigdata
[airavata-mft] branch master updated: changing PR to issues list
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-mft.git The following commit(s) were added to refs/heads/master by this push: new 60a7e65 changing PR to issues list 60a7e65 is described below commit 60a7e655ad71c4ef9ec49a7aa167080b00d53971 Author: Suresh Marru AuthorDate: Thu Jan 5 22:35:46 2023 -0500 changing PR to issues list --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 72ee268..9c8e056 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -21,7 +21,7 @@ notifications: # Send all issue emails (new, closed, comments) to issues@ issues: iss...@airavata.apache.org # Send new/closed PR notifications to dev@ - pullrequests_status: d...@airavata.apache.org + pullrequests_status: iss...@airavata.apache.org # Send individual PR comments/reviews to issues@ pullrequests_comment: iss...@airavata.apache.org
[airavata] branch master updated: Changing PR to issues list
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 c1370b241e Changing PR to issues list c1370b241e is described below commit c1370b241e98dcc9cd6a5aa700183d4e49b01028 Author: Suresh Marru AuthorDate: Thu Jan 5 22:34:55 2023 -0500 Changing PR to issues list --- .asf.yaml | 30 +- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 0fabe218bf..d4a5f2f815 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,3 +1,31 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +notifications: + commits: commits@airavata.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@airavata.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: cus...@airavata.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@airavata.apache.org + github: description: "A general purpose Distributed Systems Framework" homepage: https://airavata.apache.org/ @@ -10,4 +38,4 @@ github: - java - workfloworchestrator - workflow -- bigdata \ No newline at end of file +- bigdata
[airavata] branch master updated: Updating new Zabbix Server Location
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 a1846c1014 Updating new Zabbix Server Location a1846c1014 is described below commit a1846c10145668007575bf408084cc091a89c404 Author: Suresh Marru AuthorDate: Fri Dec 9 10:34:08 2022 -0500 Updating new Zabbix Server Location --- dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml index c3aae31f9b..d7c1d065b0 100644 --- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml @@ -234,4 +234,4 @@ zabbix_subnets: "{{ iu_subnets }}" monitoring_subnets: "{{ iu_subnets }}" # Zabbix -zabbix_server: "rt-watch.uits.indiana.edu" +zabbix_server: "rt-monitor.uits.iu.edu"
[airavata-sandbox] 19/26: updated README
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-sandbox.git commit d2260bb531df5d904b5048f8dc9606544414bc1c Author: Bhavesh Asanabada AuthorDate: Mon Jul 25 11:58:02 2022 +0530 updated README --- gsoc2022/smilesdb/README.md | 95 + 1 file changed, 52 insertions(+), 43 deletions(-) diff --git a/gsoc2022/smilesdb/README.md b/gsoc2022/smilesdb/README.md index 44208696..22ef8948 100644 --- a/gsoc2022/smilesdb/README.md +++ b/gsoc2022/smilesdb/README.md @@ -1,7 +1,7 @@ # Small Molecule Ionic Lattices (SMILES) Data Models - +![Local Build](https://img.shields.io/badge/local%20build-successful%20-green) ![GitHub last commit](https://img.shields.io/github/last-commit/bhavesh-asana/airavata-sandbox) -![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/w/bhavesh-asana/airavata-sandbox/master) +![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/bhavesh-asana/airavata-sandbox/master) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/bhavesh-asana/airavata-sandbox) @@ -12,7 +12,7 @@ embedded with the new features and advanced data visualization techniques. **DEVELOPMENT GOALS** 1. Create a robust database to reduce the latency. 2. Redesigning the data models. -3. Synchronising the data with a user dashboard. +3. Synchronising the data with a user dashboard on performing experiment successfully. # Table of Contents @@ -23,10 +23,9 @@ embedded with the new features and advanced data visualization techniques. * [Server Initialization](#server-initialization) * [Middleware (Django Application)](#middleware-django-application) * [Client Initialization](#client-initialization) - * [Database](#database) + * [Database Management](#database-management) * [Mongo Compass GUI](#visualize-the-data-with-mongo-compass-gui) -* [Mongo Shell](#visualize-with-mongo-shell) - * [Test Data](#test-data) +* [Mongo CLI](#visualize-with-mongo-cli) * [References](#references) * [The Team](#the-team) @@ -54,7 +53,6 @@ embedded with the new features and advanced data visualization techniques. ```commandline git init git clone https://github.com/bhavesh-asana/airavata-sandbox.git -cd ~/airavata-sandbox/gsoc2022/smilesdb/ ``` # How to run the project @@ -67,40 +65,51 @@ Google Remote Procedure Call (gRPC) stub is implemented in Java, which acts as a server and helps to transfer the data effectively with the connected clients across the distributed systems. -Open the **Server** directory in IntelliJ and follow the steps to run the -server application. - -1. Open the terminal in IntelliJ and ensure you are in the **Server** path. -2. Run the following commands to build the maven project. +1. Before initializing the server, make sure the MongoDB is installed and the instance + is running locally. ```commandline - mvn clean compile install - ``` -3. In the target folder, make the following directories as a source root. -1. target/classes -2. target/generated-sources/protobuf/grpc-java -3. target/generated-sources/protobuf/java -4. Run the **ServerApplication** to initialise the server. -5. On successful build, you can find the following message in the terminal. - **message:** Server running successfully - This ensures that the server is listening at the local port 7594. + mongo --port 27017 +``` + This command ensure the Mongo instance is running locally and connected the instance to the port 27017. +2. Open a new terminal window (server_runner) and change the directory to the + server codebase + ```commandline + cd ~/airavata-sandbox/gsoc2022/smilesdb/Server/ +``` +3. Build the Maven project. + ```commandline + mvn package + mvn clean install +``` +4. Run the Spring Boot application. + ```commandline + mvn spring-boot:run +``` + On successful running of the server application, it shows a message as + _"Server running successfully"_ and open connection with mongodb driver. ## Middleware (Django Application) -Open the **DjangoMiddleware** directory in Pycharm and follow the steps to run the middleware. -1. Create a virtual environment using the following command. +Open a new terminal window and follow the steps to run the middleware application. +1. Change the working directory to SMILES middleware. + ```commandline + cd ~/airavata-sandbox/gsoc2022/smilesdb/DjangoMiddleware + ``` +2. Create a virtual environment using the following command. Strictly recommended to use Python version 3.8.3 to build the **grpcio-wheel**. ```commandline - $ python -m venv - $ source /bin/activate + $ conda create -n python=3.8.3 + $ conda activate ``` -2. Install the required dependen
[airavata-sandbox] 26/26: Update README
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-sandbox.git commit 9d915509adbe869b362c97fbdf4b5ae1dcb0db77 Author: Bhavesh Asanabada <62237873+bhavesh-as...@users.noreply.github.com> AuthorDate: Mon Sep 12 19:59:23 2022 +0530 Update README Changed the directory paths and reconfigured the run commands. --- gsoc2022/smilesdb/README.md | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gsoc2022/smilesdb/README.md b/gsoc2022/smilesdb/README.md index 22ef8948..a1fa8470 100644 --- a/gsoc2022/smilesdb/README.md +++ b/gsoc2022/smilesdb/README.md @@ -88,11 +88,11 @@ connected clients across the distributed systems. On successful running of the server application, it shows a message as _"Server running successfully"_ and open connection with mongodb driver. -## Middleware (Django Application) +## RPC Handler (Django Application) Open a new terminal window and follow the steps to run the middleware application. 1. Change the working directory to SMILES middleware. ```commandline - cd ~/airavata-sandbox/gsoc2022/smilesdb/DjangoMiddleware + cd ~/airavata-sandbox/gsoc2022/smilesdb/rpc_handler ``` 2. Create a virtual environment using the following command. Strictly recommended to use Python version 3.8.3 to build the **grpcio-wheel**. @@ -109,7 +109,7 @@ Open a new terminal window and follow the steps to run the middleware applicatio ```commandline python manage.py runserver ``` -5. Open http://127.0.0.1:8000/api/calcinfo/ to check the data transmission from +5. Open http://127.0.0.1:8000/api/molecule/ to check the data transmission from the server application. On successful transmission, the data can also be visualized in the server terminal. @@ -123,17 +123,17 @@ and client application. To run the client application, open a new terminal window and follow the below steps 1. Change the working directory to SMILES Dashboard. ```commandline - cd ~/airavata-sandbox/gsoc2022/smilesdb/smiles_dashboard + cd ~/airavata-sandbox/gsoc2022/smilesdb/data-catalog ``` 2. Open the new terminal and run the following commands to build the project. ```commandline - npm install - npm run serve + yarn install + yarn run serve ``` 3. Open - http://localhost:8080/ for Login page. - - http://localhost:8080/SEAGrid for SEAGrid Homepage. - - http://localhost:8080/calcinfo for the live CalcInfo data synchronization. + - http://localhost:8080/home for SEAGrid Homepage. + - http://localhost:8080/search for the live data catalog. ## Database Management @@ -152,7 +152,7 @@ mentioned below. show dbs use smiles show collections - db.calcInfo.find() + db.molecule.find().pretty() ``` # References @@ -177,4 +177,4 @@ mentioned below. ## Contributor - Bhavesh Asanabada - [https://img.shields.io/badge/LinkedIn-0077B5?style=plastic=linkedin=white; />](https://www.linkedin.com/in/bhavesh-asana/) \ No newline at end of file + [https://img.shields.io/badge/LinkedIn-0077B5?style=plastic=linkedin=white; />](https://www.linkedin.com/in/bhavesh-asana/)
[airavata-sandbox] 05/26: defined api urls
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-sandbox.git commit cf320cfde0820b7c6fc3b6af066926a81989c44f Author: Bhavesh Asanabada AuthorDate: Mon Jul 4 06:10:57 2022 +0530 defined api urls --- .../DjangoMiddleware/DjangoMiddleware/__init__.py | 0 .../__pycache__/__init__.cpython-38.pyc| Bin 0 -> 159 bytes .../__pycache__/settings.cpython-38.pyc| Bin 0 -> 2513 bytes .../__pycache__/urls.cpython-38.pyc| Bin 0 -> 998 bytes .../__pycache__/wsgi.cpython-38.pyc| Bin 0 -> 580 bytes .../DjangoMiddleware/DjangoMiddleware/asgi.py | 16 ++ .../DjangoMiddleware/DjangoMiddleware/settings.py | 130 .../DjangoMiddleware/DjangoMiddleware/urls.py | 22 +++ .../DjangoMiddleware/DjangoMiddleware/wsgi.py | 16 ++ .../__pycache__/calc_info_pb2.cpython-38.pyc | Bin 0 -> 1596 bytes .../__pycache__/calc_info_pb2_grpc.cpython-38.pyc | Bin 0 -> 4065 bytes .../smilesdb/DjangoMiddleware/calc_info_pb2.py | 47 ++ .../DjangoMiddleware/calc_info_pb2_grpc.py | 165 + .../smilesdb/DjangoMiddleware/calcinfo/__init__.py | 0 .../calcinfo/__pycache__/__init__.cpython-38.pyc | Bin 0 -> 151 bytes .../calcinfo/__pycache__/admin.cpython-38.pyc | Bin 0 -> 192 bytes .../calcinfo/__pycache__/apps.cpython-38.pyc | Bin 0 -> 431 bytes .../calcinfo/__pycache__/models.cpython-38.pyc | Bin 0 -> 189 bytes .../calcinfo/__pycache__/urls.cpython-38.pyc | Bin 0 -> 274 bytes .../calcinfo/__pycache__/views.cpython-38.pyc | Bin 0 -> 1294 bytes .../smilesdb/DjangoMiddleware/calcinfo/admin.py| 3 + .../smilesdb/DjangoMiddleware/calcinfo/apps.py | 6 + .../calcinfo/migrations/__init__.py| 0 .../migrations/__pycache__/__init__.cpython-38.pyc | Bin 0 -> 162 bytes .../smilesdb/DjangoMiddleware/calcinfo/models.py | 3 + .../smilesdb/DjangoMiddleware/calcinfo/tests.py| 3 + .../smilesdb/DjangoMiddleware/calcinfo/urls.py | 7 + .../smilesdb/DjangoMiddleware/calcinfo/views.py| 37 + gsoc2022/smilesdb/DjangoMiddleware/db.sqlite3 | Bin 0 -> 131072 bytes gsoc2022/smilesdb/DjangoMiddleware/manage.py | 22 +++ .../DjangoMiddleware/protos/calc_info.proto| 40 + gsoc2022/smilesdb/DjangoMiddleware/requirements| 11 ++ 32 files changed, 528 insertions(+) diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__init__.py b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__init__.py new file mode 100644 index ..e69de29b diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/__init__.cpython-38.pyc b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/__init__.cpython-38.pyc new file mode 100644 index ..6b2e1d71 Binary files /dev/null and b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/__init__.cpython-38.pyc differ diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/settings.cpython-38.pyc b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/settings.cpython-38.pyc new file mode 100644 index ..fc36eeec Binary files /dev/null and b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/settings.cpython-38.pyc differ diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/urls.cpython-38.pyc b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/urls.cpython-38.pyc new file mode 100644 index ..75300992 Binary files /dev/null and b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/urls.cpython-38.pyc differ diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/wsgi.cpython-38.pyc b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/wsgi.cpython-38.pyc new file mode 100644 index ..409a6dc4 Binary files /dev/null and b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/__pycache__/wsgi.cpython-38.pyc differ diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/asgi.py b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/asgi.py new file mode 100644 index ..a8c4d0c7 --- /dev/null +++ b/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for DjangoMiddleware project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'DjangoMiddleware.settings') + +application = get_asgi_application() diff --git a/gsoc2022/smilesdb/DjangoMiddleware/DjangoMiddleware/settin
[airavata-sandbox] 12/26: Updated configuration
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-sandbox.git commit e01a18e86ec55fd7cdbfa756e20172adafa111f0 Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 22:32:42 2022 +0530 Updated configuration --- gsoc2022/smilesdb/smiles_dashboard/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gsoc2022/smilesdb/smiles_dashboard/package.json b/gsoc2022/smilesdb/smiles_dashboard/package.json index ac582f16..4bdfdfb0 100644 --- a/gsoc2022/smilesdb/smiles_dashboard/package.json +++ b/gsoc2022/smilesdb/smiles_dashboard/package.json @@ -9,7 +9,8 @@ }, "dependencies": { "core-js": "^3.8.3", -"vue": "^3.2.13" +"vue": "^3.2.13", +"vue-router": "^4.0.13" }, "devDependencies": { "@babel/core": "^7.12.16",
[airavata-sandbox] 16/26: Updated README
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-sandbox.git commit 905fa509fe7f8b6cf615ed901cc2f875114352b4 Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 23:50:47 2022 +0530 Updated README --- gsoc2022/smilesdb/README.md | 172 +++- 1 file changed, 171 insertions(+), 1 deletion(-) diff --git a/gsoc2022/smilesdb/README.md b/gsoc2022/smilesdb/README.md index 165c960e..44208696 100644 --- a/gsoc2022/smilesdb/README.md +++ b/gsoc2022/smilesdb/README.md @@ -1 +1,171 @@ -On Build!! +# Small Molecule Ionic Lattices (SMILES) Data Models + +![GitHub last commit](https://img.shields.io/github/last-commit/bhavesh-asana/airavata-sandbox) +![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/w/bhavesh-asana/airavata-sandbox/master) +![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/bhavesh-asana/airavata-sandbox) + + +This project is an experimental workspace used for the Scientific and Chemical Engineering. +This is an end to end implementation of [SEAGrid Data Catalog](https://data.seagrid.org/), +embedded with the new features and advanced data visualization techniques. + +**DEVELOPMENT GOALS** +1. Create a robust database to reduce the latency. +2. Redesigning the data models. +3. Synchronising the data with a user dashboard. + +# Table of Contents + +* [Pre-requisites](#pre-requisites) + * [Technical Stack](#technical-stack) + * [Set up the code directory](#set-up-the-code-directory) +* [How to run the project](#how-to-run-the-project) + * [Server Initialization](#server-initialization) + * [Middleware (Django Application)](#middleware-django-application) + * [Client Initialization](#client-initialization) + * [Database](#database) +* [Mongo Compass GUI](#visualize-the-data-with-mongo-compass-gui) +* [Mongo Shell](#visualize-with-mongo-shell) + * [Test Data](#test-data) +* [References](#references) +* [The Team](#the-team) + +# Pre-requisites + +## Technical Stack + +| **Function** | **Language/Framework/Technology used**| +|--|---| +| Backend Microservice Implementation | 1. Spring Boot (Java) _(Suggested tool IntelliJ)_ | +| Frontend Microservice Implementation | 1. Django (Python) 2. Vue JS _(Suggested tool PyCharm)_ | +| Inter-service Communication | 1. Google Remote Procedure Calls (gRPC) 2. REST framework | +| Database Management | MongoDB (Mongo Compass) | +| Performance Testing | BloomRPC (for gRPC routing) | + +## Set up the code directory + +**Suggestion:** For the effective workspace management, use IntelliJ and PyCharm. +**Working on Mac Environment:** + +1. Open the terminal application and set the path to the home directory, + use the command `cd ~/` to move to the home directory. +2. Clone the GitHub repository and use the following commands to change + the working directory. + ```commandline +git init +git clone https://github.com/bhavesh-asana/airavata-sandbox.git +cd ~/airavata-sandbox/gsoc2022/smilesdb/ +``` + +# How to run the project + +## Server Initialization + +On the server side, Spring Boot with the Maven configuration is being used to interact with the database +and define the proto schema. To start the communication services the +Google Remote Procedure Call (gRPC) stub is implemented in Java, which +acts as a server and helps to transfer the data effectively with the +connected clients across the distributed systems. + +Open the **Server** directory in IntelliJ and follow the steps to run the +server application. + +1. Open the terminal in IntelliJ and ensure you are in the **Server** path. +2. Run the following commands to build the maven project. + ```commandline + mvn clean compile install + ``` +3. In the target folder, make the following directories as a source root. +1. target/classes +2. target/generated-sources/protobuf/grpc-java +3. target/generated-sources/protobuf/java +4. Run the **ServerApplication** to initialise the server. +5. On successful build, you can find the following message in the terminal. + **message:** Server running successfully + This ensures that the server is listening at the local port 7594. + +## Middleware (Django Application) +Open the **DjangoMiddleware** directory in Pycharm and follow the steps to run the middleware. +1. Create a virtual environment using the following command. + Strictly recommended to use Python version 3.8.3 to build the **grpcio-wheel**. + ```commandline + $ python -m venv + $ source /bin
[airavata-sandbox] 15/26: Added navbar component
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-sandbox.git commit 4e6589b78d6eb5ed1c9e3c598859f8dc41c5566f Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 23:01:04 2022 +0530 Added navbar component --- .../smiles_dashboard/src/components/SEAGrid.vue| 37 ++ 1 file changed, 37 insertions(+) diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue b/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue index af7f29cb..ac225e81 100644 --- a/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue +++ b/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue @@ -1,4 +1,11 @@ + + + SEAGrid Data Catalog + Search + Directory Browser + + Welcome to SEAGrid Data Catalog SEAGrid Data Catalog provides a sleek web interface for you to browse and @@ -22,6 +29,7 @@ export default { + .container{ width: 70em; height: 80em; @@ -46,4 +54,33 @@ export default { height: 500px; width: 700px; } +.navbar{ +height: 3em; +width:100%; +background-color: #2C2C2C; +display: flex; +justify-content: space-between; +align-items: center; + } + + li{ +color: #edf0f1; +text-decoration: none; +font-size: 18px; + } + + .navbar li{ +display: inline-block; +padding: 0px 20px; + } + + .navbar a{ +color: #edf0f1; +text-decoration: none; +transition: all 0.3s ease 0s; + } + + .navbar a:hover{ +color: #0088a9; + } \ No newline at end of file
[airavata-sandbox] 18/26: added dependency
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-sandbox.git commit 996ef33baba43b509ce93738e7cfdd0538c167b4 Author: Bhavesh Asanabada AuthorDate: Mon Jul 25 11:46:20 2022 +0530 added dependency --- gsoc2022/smilesdb/smiles_dashboard/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gsoc2022/smilesdb/smiles_dashboard/package.json b/gsoc2022/smilesdb/smiles_dashboard/package.json index 4bdfdfb0..2fd31c76 100644 --- a/gsoc2022/smilesdb/smiles_dashboard/package.json +++ b/gsoc2022/smilesdb/smiles_dashboard/package.json @@ -8,6 +8,8 @@ "lint": "vue-cli-service lint" }, "dependencies": { +"@auth0/auth0-vue": "^1.0.2", +"axios": "^0.27.2", "core-js": "^3.8.3", "vue": "^3.2.13", "vue-router": "^4.0.13"
[airavata-sandbox] 14/26: updated SEAGrid home
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-sandbox.git commit d1d9c666a887aaf5ed64ea86b91b74e06d732f55 Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 22:35:57 2022 +0530 updated SEAGrid home --- .../smilesdb/smiles_dashboard/src/assets/architect.png | Bin 0 -> 487800 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/assets/architect.png b/gsoc2022/smilesdb/smiles_dashboard/src/assets/architect.png new file mode 100644 index ..d7ab9b24 Binary files /dev/null and b/gsoc2022/smilesdb/smiles_dashboard/src/assets/architect.png differ
[airavata-sandbox] 13/26: updated source html
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-sandbox.git commit cd50d15cc69f40048c7639778c9bd8baf8880110 Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 22:35:04 2022 +0530 updated source html --- gsoc2022/smilesdb/smiles_dashboard/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsoc2022/smilesdb/smiles_dashboard/public/index.html b/gsoc2022/smilesdb/smiles_dashboard/public/index.html index 3e5a1396..a766bb65 100644 --- a/gsoc2022/smilesdb/smiles_dashboard/public/index.html +++ b/gsoc2022/smilesdb/smiles_dashboard/public/index.html @@ -1,5 +1,5 @@ - +
[airavata-sandbox] 21/26: Masked password field
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-sandbox.git commit 98d76a9b3c5191f351ba70e80b10eab377f29f72 Author: Bhavesh Asanabada AuthorDate: Mon Aug 22 17:48:07 2022 +0530 Masked password field --- gsoc2022/smilesdb/Migrations/migration.sh | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gsoc2022/smilesdb/Migrations/migration.sh b/gsoc2022/smilesdb/Migrations/migration.sh index 1c312158..9d9f9210 100755 --- a/gsoc2022/smilesdb/Migrations/migration.sh +++ b/gsoc2022/smilesdb/Migrations/migration.sh @@ -1,24 +1,24 @@ -# echo 'b1h3a1v1e4s2h1' | openssl enc -aes-256-cbc -md sha512 -a -pbkdf2 -iter 10 -salt -pass pass:'test@123' +# echo '' | openssl enc -aes-256-cbc -md sha512 -a -pbkdf2 -iter 10 -salt -pass pass:'test@123' # chmod 600 ./secret.txt -# echo 'mysecretpassword' | openssl enc -base64 -e -aes-256-cbc -md sha512 -a -pbkdf2 -iter 10 -salt -pass pass:b1h3a1v1e4s2h1 > .secret.lck +# echo 'mysecretpassword' | openssl enc -base64 -e -aes-256-cbc -md sha512 -a -pbkdf2 -iter 10 -salt -pass pass: > .secret.lck -# b1h3a1v1e4s2h1 +# -> example: -pPass@123 echo creating database -mysql -uroot -pb1h3a1v1e4s2h1 -e "create database OEstorage" +mysql -uroot -p -e "create database OEstorage" echo Restoring Database -mysql -h 127.0.0.1 -uroot -pb1h3a1v1e4s2h1 OEstorage < ./data/dump_29july2022.sql +mysql -h 127.0.0.1 -uroot -p OEstorage < ./data/dump_29july2022.sql echo updating rows to replace double-quote -mysql -h 127.0.0.1 -uroot -pb1h3a1v1e4s2h1 -DOEstorage < ./data/moleculesUpdate.sql +mysql -h 127.0.0.1 -uroot -p -DOEstorage < ./data/moleculesUpdate.sql echo Generating JSON -mysql -h 127.0.0.1 -uroot -pb1h3a1v1e4s2h1 -DOEstorage < ./data/molecule.sql > ./data/molecule.temp1.json +mysql -h 127.0.0.1 -uroot -p -DOEstorage < ./data/molecule.sql > ./data/molecule.temp1.json # rm ./data/molecule.json echo Replacing 'NULL' with ""
[airavata-sandbox] branch master updated (acb0eb95 -> 9d915509)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-sandbox.git from acb0eb95 README file updated new 0fb56458 Query SMILES Data new e7223634 Create README.md new b1320cef Added CRUD methods to MolData new 45179241 Resolved issues in calc_topology builder new cf320cfd defined api urls new 6e446b6c vue webpage new 3174daeb refactor client new bda01d7d added pom file new 4c550149 created login page new 224764ba created SEAGrid home page new a26cda17 Added router view new e01a18e8 Updated configuration new cd50d15c updated source html new d1d9c666 updated SEAGrid home new 4e6589b7 Added navbar component new 905fa509 Updated README new ec76f4c7 added stubs & code refactor new 996ef33b added dependency new d2260bb5 updated README new 60f0cd4d added migration script new 98d76a9b Masked password field new cabce699 modified files new b602ddf3 added UI components new 76c6e42b added the rpc streamline new cb4e1a20 added UI component new 9d915509 Update README The 26 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: gsoc2022/smilesdb/Migrations/README.md |20 + .../smilesdb/Migrations/data/dump_29july2022.sql | 18230 +++ gsoc2022/smilesdb/Migrations/data/molecule.json| 1 + gsoc2022/smilesdb/Migrations/data/molecule.sql | 1 + gsoc2022/smilesdb/Migrations/data/molecule.sql.bkp | 1 + .../smilesdb/Migrations/data/moleculesUpdate.sql | 5 + gsoc2022/smilesdb/Migrations/dropcollection.js | 3 + gsoc2022/smilesdb/Migrations/migration.sh |36 + gsoc2022/smilesdb/README | 1 - gsoc2022/smilesdb/README.md| 180 + gsoc2022/smilesdb/Server/.gitignore|33 + gsoc2022/smilesdb/Server/mvnw | 316 + gsoc2022/smilesdb/Server/mvnw.cmd | 188 + gsoc2022/smilesdb/Server/pom.xml | 118 + .../src/main/java/com/smiles/CalcInfoImpl.java | 204 + .../src/main/java/com/smiles/MoleculeImpl.java | 372 + .../java/com/smiles/SpringServerApplication.java |36 + .../smilesdb/Server/src/main/proto/calc_info.proto |85 + .../smilesdb/Server/src/main/proto/molecule.proto | 119 + .../src/main/resources/application.properties | 0 .../com/smiles/SpringServerApplicationTests.java |13 + gsoc2022/smilesdb/data-catalog/README.md |24 + gsoc2022/smilesdb/data-catalog/babel.config.js | 5 + gsoc2022/smilesdb/data-catalog/jsconfig.json |19 + gsoc2022/smilesdb/data-catalog/package.json|51 + gsoc2022/smilesdb/data-catalog/public/favicon.ico | Bin 0 -> 4286 bytes gsoc2022/smilesdb/data-catalog/public/index.html |23 + gsoc2022/smilesdb/data-catalog/src/App.vue |30 + .../src/assets/data-catalog-overview.png | Bin 0 -> 464167 bytes gsoc2022/smilesdb/data-catalog/src/assets/logo.png | Bin 0 -> 6849 bytes .../data-catalog/src/components/AppHeader.vue |40 + .../data-catalog/src/components/CallBack.vue |47 + .../data-catalog/src/components/NavBar.vue |42 + gsoc2022/smilesdb/data-catalog/src/main.js |22 + .../data-catalog/src/pages/AccountInfo.vue |29 + .../smilesdb/data-catalog/src/pages/DataSheet.vue |17 + .../data-catalog/src/pages/DirectoryPage.vue |13 + .../smilesdb/data-catalog/src/pages/HomePage.vue |66 + .../smilesdb/data-catalog/src/pages/LoginPage.vue |95 + .../smilesdb/data-catalog/src/pages/SearchPage.vue | 194 + gsoc2022/smilesdb/data-catalog/src/router.js |45 + gsoc2022/smilesdb/data-catalog/vue.config.js |24 + gsoc2022/smilesdb/data-catalog/yarn.lock | 7079 +++ gsoc2022/smilesdb/rpc_handler/calc_info_pb2.py | 137 + .../smilesdb/rpc_handler/calc_info_pb2_grpc.py | 198 + .../smilesdb/rpc_handler/dataHandler}/__init__.py | 0 .../__pycache__/__init__.cpython-38.pyc| Bin 0 -> 169 bytes .../__pycache__/__init__.cpython-39.pyc| Bin 0 -> 169 bytes .../dataHandler/__pycache__/admin.cpython-38.pyc | Bin 0 -> 210 bytes .../dataHandler/__pycache__/admin.cpython-39.pyc | Bin 0 -> 210 bytes .../dataHandler/__pycache__/apps.cpython-38.pyc| Bin 0 -> 456 bytes .../dataHandler/__pycache__/apps.cpython-39.pyc| Bin 0 -> 456 bytes .../dataHandler/__pycache__/models.cpython-38.pyc | Bin 0 -> 207 bytes .../dataHandler/__p
[airavata-sandbox] 17/26: added stubs & code refactor
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-sandbox.git commit ec76f4c70c89367308f9dadfcb8251f543e1b47c Author: Bhavesh Asanabada AuthorDate: Mon Jul 25 11:25:12 2022 +0530 added stubs & code refactor --- .../DjangoMiddleware/calc_properties_pb2.py| 56 +++ .../DjangoMiddleware/calc_properties_pb2_grpc.py | 165 + .../smilesdb/DjangoMiddleware/calc_topology_pb2.py | 54 +++ .../DjangoMiddleware/calc_topology_pb2_grpc.py | 165 + .../smilesdb/DjangoMiddleware/calcinfo/views.py| 9 +- gsoc2022/smilesdb/DjangoMiddleware/molecule_pb2.py | 48 ++ .../smilesdb/DjangoMiddleware/molecule_pb2_grpc.py | 165 + .../smilesdb/smiles_dashboard/public/favicon.ico | Bin 4286 -> 0 bytes .../smiles_dashboard/src/components/HelloWorld.vue | 58 gsoc2022/smilesdb/smiles_dashboard/src/main.js | 7 +- gsoc2022/smilesdb/smiles_dashboard/src/routers.js | 11 +- 11 files changed, 674 insertions(+), 64 deletions(-) diff --git a/gsoc2022/smilesdb/DjangoMiddleware/calc_properties_pb2.py b/gsoc2022/smilesdb/DjangoMiddleware/calc_properties_pb2.py new file mode 100644 index ..3dfebd95 --- /dev/null +++ b/gsoc2022/smilesdb/DjangoMiddleware/calc_properties_pb2.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: calc_properties.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x63\x61lc_properties.proto\x12\ncom.smiles\"\x95\x08\n\tCalcProps\x12\r\n\x05InChI\x18\x01 \x01(\t\x12\x10\n\x08InChIKey\x18\x02 \x01(\t\x12\x0e\n\x06SMILES\x18\x03 \x01(\t\x12\x17\n\x0f\x43\x61nonicalSMILES\x18\x04 \x01(\t\x12\x0b\n\x03PDB\x18\x05 \x01(\t\x12\x0b\n\x03SDF\x18\x06 \x01(\t\x12\x10\n\x08ParsedBy\x18\x07 \x01(\t\x12\x0f\n\x07\x46ormula\x18\x08 \x01(\t\x12\x0e\n\x06\x43harge\x18\t \x01(\x03\x12\x14\n\x0cMulti [...] + + + +_CALCPROPS = DESCRIPTOR.message_types_by_name['CalcProps'] +_CALCPROPSREQUEST = DESCRIPTOR.message_types_by_name['CalcPropsRequest'] +CalcProps = _reflection.GeneratedProtocolMessageType('CalcProps', (_message.Message,), { + 'DESCRIPTOR' : _CALCPROPS, + '__module__' : 'calc_properties_pb2' + # @@protoc_insertion_point(class_scope:com.smiles.CalcProps) + }) +_sym_db.RegisterMessage(CalcProps) + +CalcPropsRequest = _reflection.GeneratedProtocolMessageType('CalcPropsRequest', (_message.Message,), { + 'DESCRIPTOR' : _CALCPROPSREQUEST, + '__module__' : 'calc_properties_pb2' + # @@protoc_insertion_point(class_scope:com.smiles.CalcPropsRequest) + }) +_sym_db.RegisterMessage(CalcPropsRequest) + +_CALCPROPSSERVICE = DESCRIPTOR.services_by_name['CalcPropsService'] +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'P\001' + _CALCPROPS.fields_by_name['Homos']._options = None + _CALCPROPS.fields_by_name['Homos']._serialized_options = b'\020\001' + _CALCPROPS.fields_by_name['ScfEnergies']._options = None + _CALCPROPS.fields_by_name['ScfEnergies']._serialized_options = b'\020\001' + _CALCPROPS.fields_by_name['MoEnergies']._options = None + _CALCPROPS.fields_by_name['MoEnergies']._serialized_options = b'\020\001' + _CALCPROPS.fields_by_name['AtomCoords']._options = None + _CALCPROPS.fields_by_name['AtomCoords']._serialized_options = b'\020\001' + _CALCPROPS._serialized_start=38 + _CALCPROPS._serialized_end=1083 + _CALCPROPSREQUEST._serialized_start=1085 + _CALCPROPSREQUEST._serialized_end=1168 + _CALCPROPSSERVICE._serialized_start=1171 + _CALCPROPSSERVICE._serialized_end=1482 +# @@protoc_insertion_point(module_scope) diff --git a/gsoc2022/smilesdb/DjangoMiddleware/calc_properties_pb2_grpc.py b/gsoc2022/smilesdb/DjangoMiddleware/calc_properties_pb2_grpc.py new file mode 100644 index ..08a13ca0 --- /dev/null +++ b/gsoc2022/smilesdb/DjangoMiddleware/calc_properties_pb2_grpc.py @@ -0,0 +1,165 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + +import calc_properties_pb2 as calc__properties__pb2 + + +class CalcPropsServiceStub(object): +"""Missing associated documentation comment in .proto file.""" + +def __init__(self, channel): +"""Constructor.
[airavata-sandbox] 02/26: Create README.md
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-sandbox.git commit e72236340897cb0d4ab4c30f8b12493ba1f3a77b Author: Bhavesh Asanabada <62237873+bhavesh-as...@users.noreply.github.com> AuthorDate: Mon Jun 27 08:08:58 2022 +0530 Create README.md --- gsoc2022/smilesdb/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/gsoc2022/smilesdb/README.md b/gsoc2022/smilesdb/README.md new file mode 100644 index ..165c960e --- /dev/null +++ b/gsoc2022/smilesdb/README.md @@ -0,0 +1 @@ +On Build!!
[airavata-sandbox] 23/26: added UI components
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-sandbox.git commit b602ddf3db45617c3468172957bc5c52a10a2339 Author: Bhavesh Asanabada AuthorDate: Mon Sep 12 13:44:23 2022 +0530 added UI components --- gsoc2022/smilesdb/data-catalog | 1 + 1 file changed, 1 insertion(+) diff --git a/gsoc2022/smilesdb/data-catalog b/gsoc2022/smilesdb/data-catalog new file mode 16 index ..0394951e --- /dev/null +++ b/gsoc2022/smilesdb/data-catalog @@ -0,0 +1 @@ +Subproject commit 0394951e6c2e3a178b1539165d20486eee0e20bd
[airavata-sandbox] 24/26: added the rpc streamline
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-sandbox.git commit 76c6e42b3ad98501cb9bc2663c839e7494112c71 Author: Bhavesh Asanabada AuthorDate: Mon Sep 12 13:45:35 2022 +0530 added the rpc streamline --- gsoc2022/smilesdb/rpc_handler/calc_info_pb2.py | 137 ++ .../smilesdb/rpc_handler/calc_info_pb2_grpc.py | 198 + .../smilesdb/rpc_handler/dataHandler/__init__.py | 0 .../__pycache__/__init__.cpython-38.pyc| Bin 0 -> 169 bytes .../__pycache__/__init__.cpython-39.pyc| Bin 0 -> 169 bytes .../dataHandler/__pycache__/admin.cpython-38.pyc | Bin 0 -> 210 bytes .../dataHandler/__pycache__/admin.cpython-39.pyc | Bin 0 -> 210 bytes .../dataHandler/__pycache__/apps.cpython-38.pyc| Bin 0 -> 456 bytes .../dataHandler/__pycache__/apps.cpython-39.pyc| Bin 0 -> 456 bytes .../dataHandler/__pycache__/models.cpython-38.pyc | Bin 0 -> 207 bytes .../dataHandler/__pycache__/models.cpython-39.pyc | Bin 0 -> 207 bytes .../dataHandler/__pycache__/urls.cpython-38.pyc| Bin 0 -> 290 bytes .../dataHandler/__pycache__/urls.cpython-39.pyc| Bin 0 -> 290 bytes .../dataHandler/__pycache__/views.cpython-38.pyc | Bin 0 -> 2643 bytes .../dataHandler/__pycache__/views.cpython-39.pyc | Bin 0 -> 2655 bytes gsoc2022/smilesdb/rpc_handler/dataHandler/admin.py | 3 + gsoc2022/smilesdb/rpc_handler/dataHandler/apps.py | 6 + .../rpc_handler/dataHandler/code_gen/__init__.py | 0 .../code_gen/__pycache__/__init__.cpython-39.pyc | Bin 0 -> 178 bytes .../rpc_handler/dataHandler/migrations/__init__.py | 0 .../migrations/__pycache__/__init__.cpython-38.pyc | Bin 0 -> 180 bytes .../migrations/__pycache__/__init__.cpython-39.pyc | Bin 0 -> 180 bytes .../smilesdb/rpc_handler/dataHandler/models.py | 3 + .../rpc_handler/dataHandler/protos/calc_info.proto | 73 .../rpc_handler/dataHandler/protos/molecule.proto | 116 gsoc2022/smilesdb/rpc_handler/dataHandler/tests.py | 3 + gsoc2022/smilesdb/rpc_handler/dataHandler/urls.py | 7 + gsoc2022/smilesdb/rpc_handler/dataHandler/views.py | 128 + gsoc2022/smilesdb/rpc_handler/db.sqlite3 | 0 gsoc2022/smilesdb/rpc_handler/manage.py| 22 +++ gsoc2022/smilesdb/rpc_handler/molecule_pb2.py | 137 ++ gsoc2022/smilesdb/rpc_handler/molecule_pb2_grpc.py | 198 + gsoc2022/smilesdb/rpc_handler/requirements.txt | 12 ++ .../smilesdb/rpc_handler/rpc_handler/__init__.py | 0 .../__pycache__/__init__.cpython-38.pyc| Bin 0 -> 169 bytes .../__pycache__/__init__.cpython-39.pyc| Bin 0 -> 169 bytes .../__pycache__/settings.cpython-38.pyc| Bin 0 -> 2516 bytes .../__pycache__/settings.cpython-39.pyc| Bin 0 -> 2446 bytes .../rpc_handler/__pycache__/urls.cpython-38.pyc| Bin 0 -> 1006 bytes .../rpc_handler/__pycache__/urls.cpython-39.pyc| Bin 0 -> 1006 bytes .../rpc_handler/__pycache__/wsgi.cpython-38.pyc| Bin 0 -> 580 bytes .../rpc_handler/__pycache__/wsgi.cpython-39.pyc| Bin 0 -> 580 bytes gsoc2022/smilesdb/rpc_handler/rpc_handler/asgi.py | 16 ++ .../smilesdb/rpc_handler/rpc_handler/settings.py | 118 gsoc2022/smilesdb/rpc_handler/rpc_handler/urls.py | 24 +++ gsoc2022/smilesdb/rpc_handler/rpc_handler/wsgi.py | 16 ++ 46 files changed, 1217 insertions(+) diff --git a/gsoc2022/smilesdb/rpc_handler/calc_info_pb2.py b/gsoc2022/smilesdb/rpc_handler/calc_info_pb2.py new file mode 100644 index ..892bcfd3 --- /dev/null +++ b/gsoc2022/smilesdb/rpc_handler/calc_info_pb2.py @@ -0,0 +1,137 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: calc_info.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63\x61lc_info.proto\x12\x08\x63\x61lcInfo\"\x8a\x01\n\x08\x43\x61lcInfo\x12\x13\n\x0b\x63\x61lcinfo_id\x18\x01 \x01(\t\x12\x0e\n\x06smiles\x18\x02 \x01(\t\x12\x0e\n\x06nbasis\x18\x03 \x01(\x03\x12\x0b\n\x03nmo\x18\x04 \x01(\x03\x12\x0e\n\x06nalpha\x18\x05 \x01(\x03\x12\r\n\x05nbeta\x18\x06 \x01(\x03\x12\r\n\x05natom\x18\x07 \x01(\x03\x12\x0e\n\x06\x65nergy\x18\x08 \x01(\x01\"9\n\x11\x43reateInfoRequest\x12$\n\x08\x63\x61 [...] + + + +_CALCINFO = DESCRIPTOR.message_types_by_name
[airavata-sandbox] 01/26: Query SMILES Data
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-sandbox.git commit 0fb564587eb7dfd61c480a46129e5330f5c4bb7d Author: Bhavesh Asanabada AuthorDate: Mon Jun 27 08:04:08 2022 +0530 Query SMILES Data --- gsoc2022/smilesdb/README | 1 - gsoc2022/smilesdb/Server/.gitignore| 33 + gsoc2022/smilesdb/Server/mvnw | 316 + gsoc2022/smilesdb/Server/mvnw.cmd | 188 + .../main/java/com/smiles/ServerApplication.java| 24 + .../src/main/java/com/smiles/SpringContext.java| 21 + .../java/com/smiles/calcinfo/CalcInfoEntity.java | 94 +++ .../java/com/smiles/calcinfo/CalcInfoImpl.java | 91 +++ .../java/com/smiles/calcinfo/CalcInfoRepo.java | 13 + .../java/com/smiles/calcprops/CalcPropsEntity.java | 616 + .../java/com/smiles/calcprops/CalcPropsImpl.java | 149 .../java/com/smiles/calcprops/CalcPropsRepo.java | 8 + .../smiles/calctopology/CalcTopologyEntity.java| 123 .../com/smiles/calctopology/CalcTopologyImpl.java | 52 ++ .../com/smiles/calctopology/CalcTopologyRepo.java | 10 + .../java/com/smiles/molData/MoleculeEntity.java| 761 + .../main/java/com/smiles/molData/MoleculeImpl.java | 97 +++ .../main/java/com/smiles/molData/MoleculeRepo.java | 8 + .../smilesdb/Server/src/main/proto/calc_info.proto | 49 ++ .../Server/src/main/proto/calc_properties.proto| 117 .../Server/src/main/proto/calc_topology.proto | 53 ++ .../smilesdb/Server/src/main/proto/molecule.proto | 119 .../src/main/resources/application.properties | 2 + .../java/com/smiles/ServerApplicationTests.java| 13 + .../__pycache__/calc_info_pb2.cpython-38.pyc | Bin 0 -> 1629 bytes .../__pycache__/calc_info_pb2_grpc.cpython-38.pyc | Bin 0 -> 4098 bytes gsoc2022/smilesdb/smiles_client/calc_info_pb2.py | 47 ++ .../smilesdb/smiles_client/calc_info_pb2_grpc.py | 165 + gsoc2022/smilesdb/smiles_client/main.py| 56 ++ .../smilesdb/smiles_client/proto/calc_info.proto | 40 ++ 30 files changed, 3265 insertions(+), 1 deletion(-) diff --git a/gsoc2022/smilesdb/README b/gsoc2022/smilesdb/README deleted file mode 100644 index 4ea7287d.. --- a/gsoc2022/smilesdb/README +++ /dev/null @@ -1 +0,0 @@ -GSoC project to create databases for smiles diff --git a/gsoc2022/smilesdb/Server/.gitignore b/gsoc2022/smilesdb/Server/.gitignore new file mode 100644 index ..549e00a2 --- /dev/null +++ b/gsoc2022/smilesdb/Server/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/gsoc2022/smilesdb/Server/mvnw b/gsoc2022/smilesdb/Server/mvnw new file mode 100755 index ..8a8fb228 --- /dev/null +++ b/gsoc2022/smilesdb/Server/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# +# Maven Start Up Batch script +# +# Required ENV vars: +# -- +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# - +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +#
[airavata-sandbox] 07/26: refactor client
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-sandbox.git commit 3174daebd5f8f93f4f33efacf498018cf0835607 Author: Bhavesh Asanabada AuthorDate: Mon Jul 4 06:20:34 2022 +0530 refactor client --- .../__pycache__/calc_info_pb2.cpython-38.pyc | Bin 1629 -> 0 bytes .../__pycache__/calc_info_pb2_grpc.cpython-38.pyc | Bin 4098 -> 0 bytes gsoc2022/smilesdb/smiles_client/calc_info_pb2.py | 47 -- .../smilesdb/smiles_client/calc_info_pb2_grpc.py | 165 - gsoc2022/smilesdb/smiles_client/main.py| 56 --- .../smilesdb/smiles_client/proto/calc_info.proto | 40 - 6 files changed, 308 deletions(-) diff --git a/gsoc2022/smilesdb/smiles_client/__pycache__/calc_info_pb2.cpython-38.pyc b/gsoc2022/smilesdb/smiles_client/__pycache__/calc_info_pb2.cpython-38.pyc deleted file mode 100644 index 7d70f051.. Binary files a/gsoc2022/smilesdb/smiles_client/__pycache__/calc_info_pb2.cpython-38.pyc and /dev/null differ diff --git a/gsoc2022/smilesdb/smiles_client/__pycache__/calc_info_pb2_grpc.cpython-38.pyc b/gsoc2022/smilesdb/smiles_client/__pycache__/calc_info_pb2_grpc.cpython-38.pyc deleted file mode 100644 index 3776d2a0.. Binary files a/gsoc2022/smilesdb/smiles_client/__pycache__/calc_info_pb2_grpc.cpython-38.pyc and /dev/null differ diff --git a/gsoc2022/smilesdb/smiles_client/calc_info_pb2.py b/gsoc2022/smilesdb/smiles_client/calc_info_pb2.py deleted file mode 100644 index 37a1074a.. --- a/gsoc2022/smilesdb/smiles_client/calc_info_pb2.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: calc_info.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0f\x63\x61lc_info.proto\x12\ncom.smiles\"u\n\x08\x43\x61lcInfo\x12\x0e\n\x06nbasis\x18\x01 \x01(\x03\x12\x0b\n\x03nmo\x18\x02 \x01(\x03\x12\x0e\n\x06nalpha\x18\x03 \x01(\x03\x12\r\n\x05nbeta\x18\x04 \x01(\x03\x12\r\n\x05natom\x18\x05 \x01(\x03\x12\x0e\n\x06\x65nergy\x18\x06 \x01(\x01\x12\x0e\n\x06SMILES\x18\x07 \x01(\t\"P\n\x0f\x43\x61lcInfoRequest\x12\x15\n\rcalcInfoQuery\x18\x01 \x01(\t\x12&\n\x08\x63\x61lcInfo\x18\x02 \x0 [...] - - - -_CALCINFO = DESCRIPTOR.message_types_by_name['CalcInfo'] -_CALCINFOREQUEST = DESCRIPTOR.message_types_by_name['CalcInfoRequest'] -CalcInfo = _reflection.GeneratedProtocolMessageType('CalcInfo', (_message.Message,), { - 'DESCRIPTOR' : _CALCINFO, - '__module__' : 'calc_info_pb2' - # @@protoc_insertion_point(class_scope:com.smiles.CalcInfo) - }) -_sym_db.RegisterMessage(CalcInfo) - -CalcInfoRequest = _reflection.GeneratedProtocolMessageType('CalcInfoRequest', (_message.Message,), { - 'DESCRIPTOR' : _CALCINFOREQUEST, - '__module__' : 'calc_info_pb2' - # @@protoc_insertion_point(class_scope:com.smiles.CalcInfoRequest) - }) -_sym_db.RegisterMessage(CalcInfoRequest) - -_CALCINFOSERVICE = DESCRIPTOR.services_by_name['CalcInfoService'] -if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - _CALCINFO._serialized_start=31 - _CALCINFO._serialized_end=148 - _CALCINFOREQUEST._serialized_start=150 - _CALCINFOREQUEST._serialized_end=230 - _CALCINFOSERVICE._serialized_start=233 - _CALCINFOSERVICE._serialized_end=531 -# @@protoc_insertion_point(module_scope) diff --git a/gsoc2022/smilesdb/smiles_client/calc_info_pb2_grpc.py b/gsoc2022/smilesdb/smiles_client/calc_info_pb2_grpc.py deleted file mode 100644 index dcb4a1b5.. --- a/gsoc2022/smilesdb/smiles_client/calc_info_pb2_grpc.py +++ /dev/null @@ -1,165 +0,0 @@ -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -"""Client and server classes corresponding to protobuf-defined services.""" -import grpc - -import calc_info_pb2 as calc__info__pb2 - - -class CalcInfoServiceStub(object): -"""Missing associated documentation comment in .proto file.""" - -def __init__(self, channel): -"""Constructor. - -Args: -channel: A grpc.Channel. -""" -self.GetCalcInfo = channel.unary_unary( -'/com.smiles.CalcInfoService/GetCalcInfo', - request_serializer=calc__info__pb2.CalcInfoRequest.SerializeToString, -response_deserializer=calc__info__pb2.CalcInfo.FromString, -) -self.CreateCalcInf
[airavata-sandbox] 08/26: added pom file
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-sandbox.git commit bda01d7d23c53795e198e5efbf57303124a954ae Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 18:31:16 2022 +0530 added pom file --- gsoc2022/smilesdb/Server/pom.xml | 91 1 file changed, 91 insertions(+) diff --git a/gsoc2022/smilesdb/Server/pom.xml b/gsoc2022/smilesdb/Server/pom.xml new file mode 100644 index ..cdf8e940 --- /dev/null +++ b/gsoc2022/smilesdb/Server/pom.xml @@ -0,0 +1,91 @@ + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + +org.springframework.boot +spring-boot-starter-parent +2.7.0 + + +com.smiles +Server +0.0.1-SNAPSHOT +Server +Server + +18 + + + +org.springframework.boot +spring-boot-starter + + +org.springframework.boot +spring-boot-starter-test +test + + +org.springframework.boot +spring-boot-starter-data-mongodb + + +io.grpc +grpc-netty-shaded +1.47.0 +runtime + + +io.grpc +grpc-protobuf +1.47.0 + + +io.grpc +grpc-stub +1.47.0 + + +org.apache.tomcat +annotations-api +6.0.53 +provided + + + + + + +kr.motd.maven +os-maven-plugin +1.6.2 + + + + +org.springframework.boot +spring-boot-maven-plugin + + +org.xolstice.maven.plugins +protobuf-maven-plugin +0.6.1 + + com.google.protobuf:protoc:3.19.2:exe:${os.detected.classifier} +grpc-java + io.grpc:protoc-gen-grpc-java:1.47.0:exe:${os.detected.classifier} + + + + +compile +compile-custom + + + + + + + +
[airavata-sandbox] 03/26: Added CRUD methods to MolData
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-sandbox.git commit b1320cef005d06cb8bd44a2892023dab8d86ec6b Author: Bhavesh Asanabada AuthorDate: Mon Jun 27 14:16:25 2022 +0530 Added CRUD methods to MolData --- .../java/com/smiles/calcinfo/CalcInfoImpl.java | 2 - .../java/com/smiles/calcinfo/CalcInfoRepo.java | 2 +- .../java/com/smiles/calcprops/CalcPropsEntity.java | 2 + .../java/com/smiles/calcprops/CalcPropsImpl.java | 15 ++-- .../java/com/smiles/calcprops/CalcPropsRepo.java | 4 +- .../com/smiles/calctopology/CalcTopologyImpl.java | 4 +- .../main/java/com/smiles/molData/MoleculeImpl.java | 82 +- 7 files changed, 98 insertions(+), 13 deletions(-) diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoImpl.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoImpl.java index 3798ca5e..221bf9cc 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoImpl.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoImpl.java @@ -77,7 +77,6 @@ public class CalcInfoImpl extends CalcInfoServiceGrpc.CalcInfoServiceImplBase { responseObserver.onCompleted(); } - @Override public void deleteCalcInfo(com.smiles.CalcInfoRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -87,5 +86,4 @@ public class CalcInfoImpl extends CalcInfoServiceGrpc.CalcInfoServiceImplBase { responseObserver.onNext(calcInfo); responseObserver.onCompleted(); } - } diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoRepo.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoRepo.java index 37611c92..2abe1fb0 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoRepo.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcinfo/CalcInfoRepo.java @@ -4,7 +4,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; public interface CalcInfoRepo extends MongoRepository { -public CalcInfoEntity findByNalpha(long nalpha); +//public CalcInfoEntity findByNalpha(long nalpha); public CalcInfoEntity findBySMILES(String SMILES); diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsEntity.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsEntity.java index e9b495c3..dbcbb1bd 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsEntity.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsEntity.java @@ -1,11 +1,13 @@ package com.smiles.calcprops; import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; +@Document("calcProps") public class CalcPropsEntity { @Id diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsImpl.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsImpl.java index 3aec2474..47ca39c7 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsImpl.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calcprops/CalcPropsImpl.java @@ -15,8 +15,8 @@ public class CalcPropsImpl extends CalcPropsServiceGrpc.CalcPropsServiceImplBase public void getCalcProps(CalcPropsRequest request, StreamObserver responseObserver) { //super.getCalcInfo(request, responseObserver); -CalcPropsEntity calcProps = repo1.findByPDB(request.getCalcPropsQuery()); -System.out.println(calcProps); +CalcPropsEntity calcProps = repo1.findBySMILES(request.getCalcPropsQuery()); +System.out.println(calcProps.toString()); CalcProps reply = CalcProps.newBuilder() .setInChI(calcProps.getInChI()) @@ -69,7 +69,9 @@ public class CalcPropsImpl extends CalcPropsServiceGrpc.CalcPropsServiceImplBase calcProps.getOtherinfo(), calcProps.getComments(), calcProps.getNAtom(), calcProps.getHomosList(), calcProps.getScfEnergiesList(), calcProps.getMoEnergiesList(), calcProps.getAtomCoordsList(), calcProps.getNmo(), calcProps.getNBasis()); - +repo1.save(c2001); +responseObserver.onNext(calcProps); +responseObserver.onCompleted(); } @Override @@ -77,7 +79,7 @@ public class CalcPropsImpl extends CalcPropsServiceGrpc.CalcPropsServiceImplBase //super.updateCalcProps(request, responseObserver); CalcProps calcProps = request.getCalcProp(); System.out.println(request.getAllFields()); -CalcPropsEntity c2001 = (CalcPropsEntity) repo1.findByPDB(calcPr
[airavata-sandbox] 11/26: Added router view
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-sandbox.git commit a26cda1769902b8029cfa2b47cc74bc77bd851c5 Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 22:30:04 2022 +0530 Added router view --- gsoc2022/smilesdb/smiles_dashboard/src/App.vue| 23 ++-- gsoc2022/smilesdb/smiles_dashboard/src/main.js| 4 +++- gsoc2022/smilesdb/smiles_dashboard/src/routers.js | 26 +++ 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/App.vue b/gsoc2022/smilesdb/smiles_dashboard/src/App.vue index 98060536..41a32c3d 100644 --- a/gsoc2022/smilesdb/smiles_dashboard/src/App.vue +++ b/gsoc2022/smilesdb/smiles_dashboard/src/App.vue @@ -1,35 +1,26 @@ - - - + -// import HelloWorld from './components/HelloWorld.vue' -// -// export default { -// name: 'App', -// components: { -// HelloWorld -// } -import CalcInfo from './components/CalcInfo.vue' export default { name: 'App', - components: { -CalcInfo, - } } +*{ + margin: 0; + padding: 0; +} #app { - font-family: Avenir, Helvetica, Arial, sans-serif; + font-family: "Times New Roman",sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-align: center; color: #2c3e50; - margin-top: 60px; + margin-top: 0px; } diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/main.js b/gsoc2022/smilesdb/smiles_dashboard/src/main.js index 01433bca..c982a778 100644 --- a/gsoc2022/smilesdb/smiles_dashboard/src/main.js +++ b/gsoc2022/smilesdb/smiles_dashboard/src/main.js @@ -1,4 +1,6 @@ import { createApp } from 'vue' import App from './App.vue' -createApp(App).mount('#app') +import router from "./routers" + +createApp(App).use(router).mount('#app') diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/routers.js b/gsoc2022/smilesdb/smiles_dashboard/src/routers.js new file mode 100644 index ..95358f32 --- /dev/null +++ b/gsoc2022/smilesdb/smiles_dashboard/src/routers.js @@ -0,0 +1,26 @@ +import LoginPage from "./components/LoginPage"; +import CalcInfo from "./components/CalcInfo"; + +import {createRouter, createWebHistory} from 'vue-router'; + +const routes = [ +{ +name: 'Home', +component: LoginPage, +path:'/' +}, +{ +name: 'CalcInfo', +component: CalcInfo, +path:'/calcinfo' +} +]; + +const router = createRouter( +{ +history:createWebHistory(), +routes +} +) + +export default router \ No newline at end of file
[airavata-sandbox] 04/26: Resolved issues in calc_topology builder
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-sandbox.git commit 451792418d020430d32d735a55d04e40c14d2401 Author: Bhavesh Asanabada AuthorDate: Tue Jun 28 12:03:12 2022 +0530 Resolved issues in calc_topology builder --- .../com/smiles/calctopology/CalcTopologyImpl.java | 18 ++- .../com/smiles/calctopology/CalcTopologyRepo.java | 1 + .../main/java/com/smiles/molData/MoleculeImpl.java | 146 ++--- .../Server/src/main/proto/calc_topology.proto | 6 +- 4 files changed, 88 insertions(+), 83 deletions(-) diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyImpl.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyImpl.java index 2b143010..22fa6ec2 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyImpl.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyImpl.java @@ -7,6 +7,7 @@ import com.smiles.SpringContext; import io.grpc.stub.StreamObserver; import javax.swing.*; +import java.util.ArrayList; public class CalcTopologyImpl extends CalcTopologyServiceGrpc.CalcTopologyServiceImplBase { @@ -16,20 +17,23 @@ public class CalcTopologyImpl extends CalcTopologyServiceGrpc.CalcTopologyServic //super.getCalcTopology(request, responseObserver); System.out.println(request.getAllFields()); -CalcTopologyEntity calcTopology = repo.findBySymbols(request.getcalcTopologyQuery()); +ArrayList input = new ArrayList(); +input.add(request.getCalcTopologyQuery()); +CalcTopologyEntity calcTopology = repo.findBySymbols(input); System.out.println(calcTopology.toString()); CalcTopology reply = CalcTopology.newBuilder() -.setSymbols(calcTopology.getSymbols()) -.setGeometry(calcTopology.getGeometry()) +.addAllSymbols(calcTopology.getSymbols()) +.addAllGeometry(calcTopology.getGeometry()) .setMolCharge(calcTopology.getMol_charge()) .setMolMultiplicity(calcTopology.getMol_multiplicity()) .setName(calcTopology.getName()) .setComment(calcTopology.getComment()) -.setMassNumbers(calcTopology.getMass_numbers()) -.setMasses(calcTopology.getMasses()) -.setAtomicNumber(calcTopology.getAtomic_number()) -.setAtomLabels(calcTopology.getAtomic_labels()).build(); +.addAllMassNumbers(calcTopology.getMass_numbers()) +.addAllMasses(calcTopology.getMasses()) +.addAllAtomicNumber(calcTopology.getAtomic_number()) +.addAllAtomLabels(calcTopology.getAtomic_labels()).build(); + } @Override diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyRepo.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyRepo.java index a4fd1b98..2efbebea 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyRepo.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/calctopology/CalcTopologyRepo.java @@ -7,4 +7,5 @@ import java.util.List; public interface CalcTopologyRepo extends MongoRepository { public CalcTopologyEntity findBySymbols(List symbols); + } diff --git a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/molData/MoleculeImpl.java b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/molData/MoleculeImpl.java index 6cf4a7b5..1b961a1a 100644 --- a/gsoc2022/smilesdb/Server/src/main/java/com/smiles/molData/MoleculeImpl.java +++ b/gsoc2022/smilesdb/Server/src/main/java/com/smiles/molData/MoleculeImpl.java @@ -55,7 +55,7 @@ public class MoleculeImpl extends MoleculeServiceGrpc.MoleculeServiceImplBase { //super.createMolecule(request, responseObserver); Molecule molecule = request.getMolecule(); System.out.println(request.getAllFields()); -MoleculeEntity c4001 = new MoleculeEntity(molecule.getCasNr(), +MoleculeEntity moleculeEntity = new MoleculeEntity(molecule.getCasNr(), molecule.getSmiles(), molecule.getSmilesStereo(), molecule.getInchi(), molecule.getMolfileBlobSource(), molecule.getEmpFormula(), molecule.getEmpFormulaSort(), @@ -78,7 +78,7 @@ public class MoleculeImpl extends MoleculeServiceGrpc.MoleculeServiceImplBase { molecule.getBpSource(), molecule.getSafetyR(), molecule.getSafetyH(), molecule.getSafetyS(), molecule.getSafetyP(), molecule.getSafetyText(), molecule.getSafetySym(), molecule.getSafetySymGhs(), molecule.getSafetySource(), molecule.getCommentMol()); -repo.save(c4001); +repo.save(moleculeEntity); responseObserver.onNext
[airavata-sandbox] 09/26: created login page
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-sandbox.git commit 4c550149add1057f4c15b28135df2891bdde5b6a Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 22:25:25 2022 +0530 created login page --- .../smiles_dashboard/src/assets/molecule_bg1.jpeg | Bin 0 -> 852281 bytes .../smiles_dashboard/src/components/LoginPage.vue | 115 + 2 files changed, 115 insertions(+) diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/assets/molecule_bg1.jpeg b/gsoc2022/smilesdb/smiles_dashboard/src/assets/molecule_bg1.jpeg new file mode 100644 index ..b4aecb92 Binary files /dev/null and b/gsoc2022/smilesdb/smiles_dashboard/src/assets/molecule_bg1.jpeg differ diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/components/LoginPage.vue b/gsoc2022/smilesdb/smiles_dashboard/src/components/LoginPage.vue new file mode 100644 index ..e96306c0 --- /dev/null +++ b/gsoc2022/smilesdb/smiles_dashboard/src/components/LoginPage.vue @@ -0,0 +1,115 @@ + + +Login Page + + + + +SIGN IN +Username + +Password + +Sign in +Forgot Password? +Login with CILogon + + + + + + + +export default { + name: "LoginPage" +} + + + +* { + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: 'Poppins', sans-serif; + cursor: pointer; +} + +/*@import url(<a rel="nofollow" href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro&display=swap">https://fonts.googleapis.com/css2?family=Source+Sans+Pro&display=swap</a>);*/ + +body { + height: 100vh; + width: 100%; + display: flex; + justify-content: center; + align-items: center; + /*background: linear-gradient(to right, #2C2C2C, #2c3e50);*/ + background-image: url("../assets/molecule_bg1.jpeg"); +} + +form { + width: 25rem; + height: 28rem; + margin-right: 50rem; + display: flex; + flex-direction: column; + background: rgba(255, 255, 255, 0.04); + box-shadow: 0 8px 32px 0 rgba(52, 52, 52, 0.52); + border-radius: 30px; + border-left: 1px solid rgba(255, 255, 255, 0.3); + border-top: 1px solid rgba(255, 255, 255, 0.3); + border-right: 1px solid rgba(255, 255, 255, 0.3); + border-bottom: 1px solid rgba(255, 255, 255, 0.3); +} + +h1 { + font-size: 50px; + color: #edf0f1; + text-align: center; + text-shadow: 2px 2px 4px rgba(255, 255, 255, 0.3); + letter-spacing: 3px; + margin-top: 20px; + margin-bottom: 5%; + opacity: 0.7; +} + +label { + font-size: 20px; + color: #edf0f1; + display: flex; + text-align: left; + margin-left: 10%; + margin-bottom:1px; + opacity: 0.8; + text-shadow: 2px 2px 4px rgba(255, 255, 255, 0.3); +} + +input { + width: 80%; + height: 20px; + font-size: 18px; + margin: 5% auto 8%; + border: none; + outline: none; + background: transparent; + color: white; + border-bottom: 1px solid rgba(255, 255, 255, 0.6); +} + +button { + width: 50%; + margin: 3% auto; + color: white; + font-size: 15px; + opacity: 0.7; + background: rgba(255, 255, 255, 0.06); + padding: 10px 30px; + border: none; + outline: none; + border-radius: 20px; + text-shadow: 2px 2px 4px rgba(255, 255, 255, 0.3); + box-shadow: 3px 3px 5px rgba(255, 255, 255, 0.32); + border-left: 2px solid rgba(255, 255, 255, 0.3); + border-right: 2px solid rgba(255, 255, 255, 0.3); + border-top: 2px solid rgba(255, 255, 255, 0.3); +} + \ No newline at end of file
[airavata-sandbox] 10/26: created SEAGrid home page
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-sandbox.git commit 224764ba5dc19518aacd7e2ba9c131fc165865e7 Author: Bhavesh Asanabada AuthorDate: Thu Jul 14 22:26:26 2022 +0530 created SEAGrid home page --- .../smiles_dashboard/src/components/SEAGrid.vue| 49 ++ 1 file changed, 49 insertions(+) diff --git a/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue b/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue new file mode 100644 index ..af7f29cb --- /dev/null +++ b/gsoc2022/smilesdb/smiles_dashboard/src/components/SEAGrid.vue @@ -0,0 +1,49 @@ + + +Welcome to SEAGrid Data Catalog +SEAGrid Data Catalog provides a sleek web interface for you to browse and + search through your SEAGrid data. Currently the system can index outputs of + several computational chemistry applications including Gaussian, Gamess, + Molpro and NWChem. Also it allows to publish your data into research data + publishing systems, do browser based visualization of molecular structure + and properties and to run complex search queries to filter the data. + So now you don't need to download all the data into your local machine after + running a HPC application but select only the interesting data based on the + results of configured post processing steps in the system. + + + + + +export default { + name: "SEAGrid" +} + + + + + .container{ +width: 70em; +height: 80em; +margin-left: auto; +margin-right: auto; + } + h1 { +padding-top: 1em; +position: center; +text-decoration: black; + } + p{ +display: block; +margin-block-start: 1em; +margin-block-end: 1em; +margin-inline-start: 0px; +margin-inline-end: 0px; +text-align: justify ; +font-size: 21px; + } + .sys-architect{ +height: 500px; +width: 700px; + } + \ No newline at end of file
[airavata-sandbox] 06/13: Update README.md
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-sandbox.git commit daf1b350c2b109e9f3e6bbc838cf4e627196e0bf Author: Aishwarya Vijay Sinhasane <48974593+aishwaryasinhas...@users.noreply.github.com> AuthorDate: Thu Jul 21 03:10:43 2022 -0400 Update README.md --- gsoc2022/seagrid-rich-client/README.md | 15 +++ 1 file changed, 15 insertions(+) diff --git a/gsoc2022/seagrid-rich-client/README.md b/gsoc2022/seagrid-rich-client/README.md index 72b651da..4cd99781 100644 --- a/gsoc2022/seagrid-rich-client/README.md +++ b/gsoc2022/seagrid-rich-client/README.md @@ -7,6 +7,21 @@ ![architecture](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview%20(2).png) ## Steps to Run the Application +### Installation Steps: + + To run electronJS application you need to install node.js. + Follow below installation steps for node.js + + - https://nodejs.org/en/download/ + + Check node.js installed + - npm -v + - node -v + + Now to install electronJS run below command. +- npm install --save-dev electron + + Run Application 1. Clone the repository. 2. Run below command - npm start
[airavata-sandbox] 13/13: README file updated
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-sandbox.git commit acb0eb95dc6bbc2fd84e38fbf5e19e262193ed35 Author: BECOB257_Aishwarya Sinhasane AuthorDate: Sun Sep 11 20:56:49 2022 -0400 README file updated --- .../{ => Images}/Modified_SeaGrid_Overview (2).png | Bin gsoc2022/seagrid-rich-client/Images/Mol3dEditor.png | Bin 0 -> 246813 bytes gsoc2022/seagrid-rich-client/Images/jsme.png | Bin 0 -> 199966 bytes gsoc2022/seagrid-rich-client/Images/nglviewer.png| Bin 0 -> 334069 bytes gsoc2022/seagrid-rich-client/README.md | 19 +-- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).png b/gsoc2022/seagrid-rich-client/Images/Modified_SeaGrid_Overview (2).png similarity index 100% rename from gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).png rename to gsoc2022/seagrid-rich-client/Images/Modified_SeaGrid_Overview (2).png diff --git a/gsoc2022/seagrid-rich-client/Images/Mol3dEditor.png b/gsoc2022/seagrid-rich-client/Images/Mol3dEditor.png new file mode 100644 index ..753a4060 Binary files /dev/null and b/gsoc2022/seagrid-rich-client/Images/Mol3dEditor.png differ diff --git a/gsoc2022/seagrid-rich-client/Images/jsme.png b/gsoc2022/seagrid-rich-client/Images/jsme.png new file mode 100644 index ..41c14892 Binary files /dev/null and b/gsoc2022/seagrid-rich-client/Images/jsme.png differ diff --git a/gsoc2022/seagrid-rich-client/Images/nglviewer.png b/gsoc2022/seagrid-rich-client/Images/nglviewer.png new file mode 100644 index ..e142a5fe Binary files /dev/null and b/gsoc2022/seagrid-rich-client/Images/nglviewer.png differ diff --git a/gsoc2022/seagrid-rich-client/README.md b/gsoc2022/seagrid-rich-client/README.md index 73754958..8f3373a8 100644 --- a/gsoc2022/seagrid-rich-client/README.md +++ b/gsoc2022/seagrid-rich-client/README.md @@ -4,7 +4,7 @@ ## Architecture of system -![architecture](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview%20(2).png) +![architecture](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Images/Modified_SeaGrid_Overview%20(2).png) ## Steps to Run the Application ### Installation Steps: @@ -21,7 +21,7 @@ Now to install electronJS run below command. - - npm install --save-dev electron + - npm install electron --save-dev Run Application 1. Clone the repository. @@ -31,3 +31,18 @@ 3. This will launch the application 4. You can login with your credentials and try to submit the experiment. Also you can view molecule structures using molecule viewer. +### Features of Application +1. Molecule Viewer + ![NGL](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Images/nglviewer.png) + +2. Molecule Editors + + 1. JSME Editor + + ![JSME](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Images/jsme.png) + + 2. Mol3dEditor + + ![Mol3dEditor](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Images/Mol3dEditor.png) + +
[airavata-sandbox] 12/13: external applications added
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-sandbox.git commit 57765045263d1074b6a8b69f034cb4c214f1927a Author: BECOB257_Aishwarya Sinhasane AuthorDate: Sun Sep 11 19:45:23 2022 -0400 external applications added --- gsoc2022/seagrid-rich-client/main.js | 68 ++-- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/main.js b/gsoc2022/seagrid-rich-client/main.js index e2436460..e3d4359c 100644 --- a/gsoc2022/seagrid-rich-client/main.js +++ b/gsoc2022/seagrid-rich-client/main.js @@ -10,7 +10,8 @@ const {app, BrowserWindow, MenuItem} = require('electron') const path = require('path') const { Menu, dialog, shell } = require('electron') const defaultMenu = require('electron-default-menu') -var {spawn} = require('child_process') +var os = require('os'); +const { win32 } = require('path') var child = require('child_process').execFile; function createWindow () { // Create the browser window. @@ -37,23 +38,8 @@ function createMolWindow () { } }) - // and load the login page for app - //editorWindow.load("nanocad.html") editorWindow.loadURL("http://nglviewer.org/ngl/?script=showcase/ferredoxin;) } -function createJSMolWindow () { - // Create the browser window. - const JSMolWindow = new BrowserWindow({ -width: 800, -height: 600, -webPreferences: { - preload: path.join(__dirname, 'preload.js') -} - }) - - // and load the login page for app - JSMolWindow.loadFile("C:\\Users\\aishw\\gsoc\\seagrid-client\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\ui\\samplemol.html") -} function createJSMEWindow(){ const JSMEWindow = new BrowserWindow({ width: 800, @@ -63,8 +49,10 @@ function createJSMEWindow(){ } }) - // and load the login page for app - JSMEWindow.loadFile("C:\\Users\\aishw\\gsoc\\seagrid-client-electron\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\JSME\\dist\\index.html") + if(process.platform == win32) +JSMEWindow.loadFile(".\\JSME\\dist\\index.html") + else +JSMEWindow.loadFile("./JSME/dist/index.html") } function createMol3DWindow(){ const Mol3DWindow = new BrowserWindow({ @@ -74,19 +62,32 @@ function createMol3DWindow(){ preload: path.join(__dirname, 'preload.js') } }) - - // and load the login page for app Mol3DWindow.loadURL("https://molview.org/;) } function createAvogadro(){ -var executablePath = 'C:\\Program Files\\Avogadro2\\bin\\avogadro2.exe'; -var parameters = ['Hai', 'Test', 'Dat']; -child(executablePath, function (err, data) { +var homedir = process.env.HOME; +if(os.platform == 'win32') + var executablePath = 'C:\\Program Files\\Avogadro2\\bin\\avogadro2.exe'; +else + var executablePath = homedir + '/Applications/avogadro2'; +child(executablePath, function (err, data) { console.log(err) console.log(data.toString()); -}); +}); +} +function createVMD(){ + + var homedir = process.env.HOME; + if(os.platform == 'win32') +var executablePath = 'C:\\Program Files\\VMD\\vmd.exe'; + else +var executablePath = homedir + '/Applications/vmd'; + child(executablePath, function (err, data) { + console.log(err) + console.log(data.toString()); + }); } // This method will be called when Electron has finished @@ -100,9 +101,8 @@ app.whenReady().then(() => { // dock icon is clicked and there are no other windows open. if (BrowserWindow.getAllWindows().length === 0) createWindow() }) - const menu = defaultMenu(app, shell); + const menu = defaultMenu(app, shell); - // Add custom menu menu.splice(1,0,{ label: 'Molecule Viewer', @@ -112,12 +112,6 @@ app.whenReady().then(() => { click: (item, focusedWindow) => { createMolWindow() } - }, - { -label: 'JSMol Viewer', -click: (item, focusedWindow) => { - createJSMolWindow() -} } ] }); @@ -138,14 +132,20 @@ app.whenReady().then(() => { } ] }); - menu.splice(2,0,{ -label: 'Avogadro Application', + menu.splice(3,0,{ +label: 'External Applications', submenu: [ { label: 'Avogadro Editor', click: (item, focusedWindow) => { createAvogadro() } + }, + { +label: 'VMD', +click: (item, focusedWindow) => { + createVMD() +} } ] });
[airavata-sandbox] 03/13: Delete Modified_SeaGrid_Overview (2).jpg
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-sandbox.git commit 214fbb1fc136264cac5dd1ae3f8f3db8c8591fb3 Author: Aishwarya Vijay Sinhasane <48974593+aishwaryasinhas...@users.noreply.github.com> AuthorDate: Wed Jul 20 16:52:25 2022 -0400 Delete Modified_SeaGrid_Overview (2).jpg --- .../Modified_SeaGrid_Overview (2).jpg | Bin 102337 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).jpg b/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).jpg deleted file mode 100644 index e555b5f5.. Binary files a/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).jpg and /dev/null differ
[airavata-sandbox] 07/13: Update README.md
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-sandbox.git commit cb7f652f0b5a7e30d91677c66224e0f4b165c12c Author: Aishwarya Vijay Sinhasane <48974593+aishwaryasinhas...@users.noreply.github.com> AuthorDate: Thu Jul 21 03:12:04 2022 -0400 Update README.md --- gsoc2022/seagrid-rich-client/README.md | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/README.md b/gsoc2022/seagrid-rich-client/README.md index 4cd99781..73754958 100644 --- a/gsoc2022/seagrid-rich-client/README.md +++ b/gsoc2022/seagrid-rich-client/README.md @@ -15,15 +15,18 @@ - https://nodejs.org/en/download/ Check node.js installed - - npm -v + + - npm -v - node -v Now to install electronJS run below command. -- npm install --save-dev electron + + - npm install --save-dev electron Run Application 1. Clone the repository. 2. Run below command + - npm start 3. This will launch the application 4. You can login with your credentials and try to submit the experiment. Also you can view molecule structures using molecule viewer.
[airavata-sandbox] 05/13: Create README.md
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-sandbox.git commit f235532d4ae75e120616fa7cd440db30301bfba1 Author: Aishwarya Vijay Sinhasane <48974593+aishwaryasinhas...@users.noreply.github.com> AuthorDate: Wed Jul 20 16:57:10 2022 -0400 Create README.md --- gsoc2022/seagrid-rich-client/README.md | 15 +++ 1 file changed, 15 insertions(+) diff --git a/gsoc2022/seagrid-rich-client/README.md b/gsoc2022/seagrid-rich-client/README.md new file mode 100644 index ..72b651da --- /dev/null +++ b/gsoc2022/seagrid-rich-client/README.md @@ -0,0 +1,15 @@ +## GSOC 2022 Project + +- **Aishwarya Sinhasane** + +## Architecture of system + +![architecture](https://github.com/aishwaryasinhasane/airavata-sandbox/blob/master/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview%20(2).png) + +## Steps to Run the Application +1. Clone the repository. +2. Run below command + - npm start +3. This will launch the application +4. You can login with your credentials and try to submit the experiment. Also you can view molecule structures using molecule viewer. +
[airavata-sandbox] 02/13: Add files via upload
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-sandbox.git commit efe17ebb854d1d9e8835d467858573fd2b3d7ecc Author: Aishwarya Vijay Sinhasane <48974593+aishwaryasinhas...@users.noreply.github.com> AuthorDate: Wed Jul 20 16:46:09 2022 -0400 Add files via upload --- .../Modified_SeaGrid_Overview (2).jpg | Bin 0 -> 102337 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).jpg b/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).jpg new file mode 100644 index ..e555b5f5 Binary files /dev/null and b/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).jpg differ
[airavata-sandbox] 08/13: refactored code
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-sandbox.git commit 1dbb954fbaf065ee86ceab4b0624e8bef18b0da3 Author: BECOB257_Aishwarya Sinhasane AuthorDate: Thu Jul 21 03:43:57 2022 -0400 refactored code --- gsoc2022/seagrid-rich-client/main.js | 8 gsoc2022/seagrid-rich-client/{ => ui}/1aho.pdb | 0 gsoc2022/seagrid-rich-client/{ => ui/css}/styles.css | 0 gsoc2022/seagrid-rich-client/{ => ui}/nanocad.html | 0 gsoc2022/seagrid-rich-client/{ => ui}/ngl.js | 0 gsoc2022/seagrid-rich-client/{ => ui}/samplemol.html | 1 - gsoc2022/seagrid-rich-client/{ => ui}/samplengl.html | 0 gsoc2022/seagrid-rich-client/{ => ui}/summary.html | 0 8 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/main.js b/gsoc2022/seagrid-rich-client/main.js index ab5a06af..b9f64f71 100644 --- a/gsoc2022/seagrid-rich-client/main.js +++ b/gsoc2022/seagrid-rich-client/main.js @@ -51,7 +51,7 @@ function createJSMolWindow () { }) // and load the login page for app - JSMolWindow.loadFile("samplengl.html") + JSMolWindow.loadFile("C:\\Users\\aishw\\gsoc\\airavata-gsoc2022\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\ui\\samplemol.html") //editorWindow.loadURL("http://nglviewer.org/ngl/?script=showcase/ferredoxin;) } // This method will be called when Electron has finished @@ -70,16 +70,16 @@ app.whenReady().then(() => { // Add custom menu menu.splice(1,0,{ -label: 'Molecule Editor', +label: 'Molecule Viewer', submenu: [ { -label: 'nanocad', +label: 'NGLViewer', click: (item, focusedWindow) => { createMolWindow() } }, { -label: 'JSMol Editor', +label: 'JSMol Viewer', click: (item, focusedWindow) => { createJSMolWindow() } diff --git a/gsoc2022/seagrid-rich-client/1aho.pdb b/gsoc2022/seagrid-rich-client/ui/1aho.pdb similarity index 100% rename from gsoc2022/seagrid-rich-client/1aho.pdb rename to gsoc2022/seagrid-rich-client/ui/1aho.pdb diff --git a/gsoc2022/seagrid-rich-client/styles.css b/gsoc2022/seagrid-rich-client/ui/css/styles.css similarity index 100% rename from gsoc2022/seagrid-rich-client/styles.css rename to gsoc2022/seagrid-rich-client/ui/css/styles.css diff --git a/gsoc2022/seagrid-rich-client/nanocad.html b/gsoc2022/seagrid-rich-client/ui/nanocad.html similarity index 100% rename from gsoc2022/seagrid-rich-client/nanocad.html rename to gsoc2022/seagrid-rich-client/ui/nanocad.html diff --git a/gsoc2022/seagrid-rich-client/ngl.js b/gsoc2022/seagrid-rich-client/ui/ngl.js similarity index 100% rename from gsoc2022/seagrid-rich-client/ngl.js rename to gsoc2022/seagrid-rich-client/ui/ngl.js diff --git a/gsoc2022/seagrid-rich-client/samplemol.html b/gsoc2022/seagrid-rich-client/ui/samplemol.html similarity index 98% rename from gsoc2022/seagrid-rich-client/samplemol.html rename to gsoc2022/seagrid-rich-client/ui/samplemol.html index 953d585d..215220db 100644 --- a/gsoc2022/seagrid-rich-client/samplemol.html +++ b/gsoc2022/seagrid-rich-client/ui/samplemol.html @@ -10,7 +10,6 @@ here is structure - jmolApplet(400,"load 1aho.pdb","0"); diff --git a/gsoc2022/seagrid-rich-client/samplengl.html b/gsoc2022/seagrid-rich-client/ui/samplengl.html similarity index 100% rename from gsoc2022/seagrid-rich-client/samplengl.html rename to gsoc2022/seagrid-rich-client/ui/samplengl.html diff --git a/gsoc2022/seagrid-rich-client/summary.html b/gsoc2022/seagrid-rich-client/ui/summary.html similarity index 100% rename from gsoc2022/seagrid-rich-client/summary.html rename to gsoc2022/seagrid-rich-client/ui/summary.html
[airavata-sandbox] 09/13: JSME Editor added
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-sandbox.git commit 74b501053d845a23c8659ff43002aab9c12b03d6 Author: BECOB257_Aishwarya Sinhasane AuthorDate: Tue Jul 26 14:34:13 2022 -0400 JSME Editor added --- gsoc2022/seagrid-rich-client/JSME-webpack-example | 1 + gsoc2022/seagrid-rich-client/main.js | 18 +++--- gsoc2022/seagrid-rich-client/ngl | 1 - gsoc2022/seagrid-rich-client/package-lock.json| 14 +++--- gsoc2022/seagrid-rich-client/package.json | 2 +- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/JSME-webpack-example b/gsoc2022/seagrid-rich-client/JSME-webpack-example new file mode 16 index ..07b3a035 --- /dev/null +++ b/gsoc2022/seagrid-rich-client/JSME-webpack-example @@ -0,0 +1 @@ +Subproject commit 07b3a035775fc3f5b6cb7b2dc0288e68d123e1c9 diff --git a/gsoc2022/seagrid-rich-client/main.js b/gsoc2022/seagrid-rich-client/main.js index b9f64f71..c0dad527 100644 --- a/gsoc2022/seagrid-rich-client/main.js +++ b/gsoc2022/seagrid-rich-client/main.js @@ -54,6 +54,18 @@ function createJSMolWindow () { JSMolWindow.loadFile("C:\\Users\\aishw\\gsoc\\airavata-gsoc2022\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\ui\\samplemol.html") //editorWindow.loadURL("http://nglviewer.org/ngl/?script=showcase/ferredoxin;) } +function createJSMEWindow(){ + const JSMEWindow = new BrowserWindow({ +width: 800, +height: 600, +webPreferences: { + preload: path.join(__dirname, 'preload.js') +} + }) + + // and load the login page for app + JSMEWindow.loadFile("C:\\Users\\aishw\\gsoc\\airavata-gsoc2022\\airavata-sandbox\\gsoc2022\\seagrid-rich-client\\JSME-webpack-example\\dist\\index.html") +} // This method will be called when Electron has finished // initialization and is ready to create browser windows. // Some APIs can only be used after this event occurs. @@ -87,12 +99,12 @@ app.whenReady().then(() => { ] }); menu.splice(2,0,{ -label: 'Applicaion Editor', +label: 'Molecule Editor', submenu: [ { -label: 'G09', +label: 'JSME Editor', click: (item, focusedWindow) => { - dialog.showMessageBox({message: 'Do something', buttons: ['OK'] }); + createJSMEWindow() } } ] diff --git a/gsoc2022/seagrid-rich-client/ngl b/gsoc2022/seagrid-rich-client/ngl deleted file mode 16 index bd4a31c7.. --- a/gsoc2022/seagrid-rich-client/ngl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd4a31c72e007d170b6bae298a5f7c976070e173 diff --git a/gsoc2022/seagrid-rich-client/package-lock.json b/gsoc2022/seagrid-rich-client/package-lock.json index 5c554ad9..23fdf74a 100644 --- a/gsoc2022/seagrid-rich-client/package-lock.json +++ b/gsoc2022/seagrid-rich-client/package-lock.json @@ -13,7 +13,7 @@ "ngl": "^0.10.4" }, "devDependencies": { -"electron": "^19.0.4" +"electron": "^19.0.9" } }, "node_modules/@electron/get": { @@ -251,9 +251,9 @@ "dev": true }, "node_modules/electron": { - "version": "19.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.4.tgz;, - "integrity": "sha512-roRYr1VNAWIhjD9n8qZdmhROtrzsFpuZEXrjWAw+GqPbZlrUInmvFCviRDC2Lt+VBsTNRpTfPpfzXSlLL4reEw==", + "version": "19.0.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.9.tgz;, + "integrity": "sha512-ooEwrv8Y7NSzdhKcl6kPCYecnzcg5nFWuS5ryG+VFH3MMBR8zXh9nW2wLsZrBz6OGUxXrcc5BKBC7dA8C6RhGQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -1184,9 +1184,9 @@ "dev": true }, "electron": { - "version": "19.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.4.tgz;, - "integrity": "sha512-roRYr1VNAWIhjD9n8qZdmhROtrzsFpuZEXrjWAw+GqPbZlrUInmvFCviRDC2Lt+VBsTNRpTfPpfzXSlLL4reEw==", + "version": "19.0.9", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.9.tgz;, + "integrity": "sha512-ooEwrv8Y7NSzdhKcl6kPCYecnzcg5nFWuS5ryG+VFH3MMBR8zXh9nW2wLsZrBz6OGUxXrcc5BKBC7dA8C6RhGQ==", "dev": true, "requires": { "@electron/get": "^1.14.1", diff --git a/gsoc2022/seagrid-rich-client/package.json b/gsoc2022/seagrid-rich-client/package.json index 85007893..f8a00601 100644 --- a/gsoc2022/seagrid-rich-client/package.json +++ b/gsoc2022/seagrid-rich-client/package.json @@ -16,7 +16,7 @@ "author": "Aishwarya", "license": "CC0-1.0", "devDependencies": { -"electron": "^19.0.4" +"electron": "^19.0.9" }, "dependencies": { "electron-default-menu": "^1.0.2",
[airavata-sandbox] 04/13: Add files via upload
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-sandbox.git commit 6ef0d0706b98240dbbc7766651221c6831316804 Author: Aishwarya Vijay Sinhasane <48974593+aishwaryasinhas...@users.noreply.github.com> AuthorDate: Wed Jul 20 16:52:40 2022 -0400 Add files via upload --- .../Modified_SeaGrid_Overview (2).png | Bin 0 -> 313195 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).png b/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).png new file mode 100644 index ..23503ce4 Binary files /dev/null and b/gsoc2022/seagrid-rich-client/Modified_SeaGrid_Overview (2).png differ
[airavata] branch master updated: reverting to production url
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 f042a5cc47 reverting to production url f042a5cc47 is described below commit f042a5cc479a8183757af9ba3719bb863ac08494 Author: Suresh Marru AuthorDate: Mon Aug 1 14:02:55 2022 -0400 reverting to production url --- .../inventories/scigap/production/host_vars/futurewater/vars.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml index 3b16fced2f..b594a34e69 100644 --- a/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml @@ -32,8 +32,7 @@ user_data_dir: "/var/www/portals/gateway-user-data" # tusd_vhost_servername: "tus.scigap.org" tusd_vhost_servername: -# vhost_servername: "gateway.futurewater.indiana.edu" -vhost_servername: "futurewater.js2.scigap.org" +vhost_servername: "gateway.futurewater.indiana.edu" vhost_ssl: True ssl_certificate_file: "/etc/letsencrypt/live/{{ vhost_servername }}/cert.pem" ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername }}/fullchain.pem"
[airavata-site] branch asf-site updated: Changing copyright year
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 2e9170b Changing copyright year 2e9170b is described below commit 2e9170b0ed9300d9cb83ff9833034d84340a6e9e Author: Suresh Marru AuthorDate: Tue Apr 26 17:12:29 2022 -0400 Changing copyright year --- content/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/index.html b/content/index.html index 99f8afc..897b80c 100644 --- a/content/index.html +++ b/content/index.html @@ -392,8 +392,8 @@ -Copyright 2021 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. +Copyright 2022 The Apache Software Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache feather logo are trademarks of The Apache Software Foundation.
[airavata] branch master updated (f412aeb290 -> e12c2497d5)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git from f412aeb290 AIRAVATA-3590 upgrade log4j and commons-io add e12c2497d5 AIRAVATA-3590 remove xmlbeans No new revisions were added by this update. Summary of changes: modules/distribution/pom.xml | 11 --- pom.xml | 2 -- 2 files changed, 13 deletions(-)
[airavata] branch master updated: AIRAVATA-3590 upgrade log4j and commons-io
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 f412aeb290 AIRAVATA-3590 upgrade log4j and commons-io f412aeb290 is described below commit f412aeb290dda5be31e950dd3a0d8561280dd357 Author: PJ Fanning AuthorDate: Thu Mar 17 13:42:39 2022 +0100 AIRAVATA-3590 upgrade log4j and commons-io --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 64507cd0ed..d7c9562e1c 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ UTF-8 10.13.1.1 1.7.25 -2.16.0 +2.17.2 3.0.0-M4 4.12 2.8.0 @@ -111,7 +111,7 @@ 3.3.0 1.0.0 20160212 -2.4 +2.11.0 20.0 0.8.1 3.1.0
[airavata] branch master updated (d3e29bcf03 -> 97a205cbc2)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git from d3e29bcf03 Update email-config.yaml.j2 new 08a15d1123 jackson 2.9.10.8 new 97a205cbc2 update versions The 2 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: .../profile-service/iam-admin-services-core/pom.xml | 2 +- modules/distribution/pom.xml | 16 pom.xml | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-)
[airavata] 01/02: jackson 2.9.10.8
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 commit 08a15d11238a8a0444f12d7247eba54732f259a9 Author: PJ Fanning AuthorDate: Thu Mar 17 14:19:25 2022 +0100 jackson 2.9.10.8 --- airavata-services/profile-service/iam-admin-services-core/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- pom.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml index fd3b0acab1..7028f7b2d0 100644 --- a/airavata-services/profile-service/iam-admin-services-core/pom.xml +++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml @@ -68,7 +68,7 @@ com.fasterxml.jackson.core jackson-databind -2.5.4 +${jackson.databind.version} diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 2e2c35db04..37a8087aa6 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -324,7 +324,7 @@ com.fasterxml.jackson.core jackson-databind -2.9.4 +${jackson.databind.version} com.fasterxml.jackson.core diff --git a/pom.xml b/pom.xml index ffe1ae8d69..ea291e72c9 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,7 @@ 2.10.7 1.2.7 0.9.4 +2.9.10.8 1.13 1.3.1 1.1.3
[airavata-sandbox] branch master updated: adding a placeholder for 2022 gsoc projects
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-sandbox.git The following commit(s) were added to refs/heads/master by this push: new 2971402 adding a placeholder for 2022 gsoc projects 2971402 is described below commit 2971402f7f3cd5c32eec2052206f93069306f785 Author: Suresh Marru AuthorDate: Tue Mar 22 11:55:54 2022 -0400 adding a placeholder for 2022 gsoc projects --- gsoc2022/smilesdb/README | 1 + 1 file changed, 1 insertion(+) diff --git a/gsoc2022/smilesdb/README b/gsoc2022/smilesdb/README new file mode 100644 index 000..4ea7287 --- /dev/null +++ b/gsoc2022/smilesdb/README @@ -0,0 +1 @@ +GSoC project to create databases for smiles
[airavata-data-lake] branch master updated: enabling issues
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-data-lake.git The following commit(s) were added to refs/heads/master by this push: new e60e426 enabling issues e60e426 is described below commit e60e4267a0c2099c151d95314d3a3a8c5faa7e74 Author: Suresh Marru AuthorDate: Fri Feb 11 12:46:22 2022 -0500 enabling issues --- .asf.yaml | 41 + 1 file changed, 41 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..a72ed27 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,41 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +notifications: + commits: commits@airavata.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@airavata.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: iss...@airavata.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@airavata.apache.org + +github: + description: "Apache Airavata Data Lake" + homepage: https://airavata.apache.org/ + labels: +- airavata +- apache +- data +- lake +- MFT + + features: +wiki: true +issues: true +projects: true
[airavata-jupyter-kernel] branch master created (now ba5d76b)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-jupyter-kernel.git. at ba5d76b bootsrtapong the repo This branch includes the following new commits: new ba5d76b bootsrtapong the repo The 1 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.
[airavata-jupyter-kernel] 01/01: bootsrtapong the repo
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-jupyter-kernel.git commit ba5d76b4a43ae6f66c3c4a07809aa5e29653f3a4 Author: Suresh Marru AuthorDate: Wed Jan 26 15:12:34 2022 -0500 bootsrtapong the repo --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README new file mode 100644 index 000..a59df2e --- /dev/null +++ b/README @@ -0,0 +1 @@ +Repository for Apache Airavata Jupyter Extensions \ No newline at end of file
[airavata-site] 01/01: Merge pull request #8 from apache/asf-staging
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git commit 8b0bf4f2f27b7b82408fb9539e5f82bb7399332c Merge: e8fbbda 72a1ec9 Author: Suresh Marru AuthorDate: Wed May 19 10:55:56 2021 -0400 Merge pull request #8 from apache/asf-staging adding yaml file to configure stagin .asf.yaml | 51 +++ 1 file changed, 51 insertions(+)
[airavata-site] branch asf-site updated (e8fbbda -> 8b0bf4f)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git. from e8fbbda updates affiliations add 72a1ec9 adding yaml file to configure stagin new 8b0bf4f Merge pull request #8 from apache/asf-staging The 1 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: .asf.yaml | 51 +++ 1 file changed, 51 insertions(+) create mode 100644 .asf.yaml
[airavata-site] branch asf-staging created (now 72a1ec9)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch asf-staging in repository https://gitbox.apache.org/repos/asf/airavata-site.git. at 72a1ec9 adding yaml file to configure stagin This branch includes the following new commits: new 72a1ec9 adding yaml file to configure stagin The 1 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.
[airavata-site] 01/01: adding yaml file to configure stagin
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/airavata-site.git commit 72a1ec91f429918190118e1dad72549c83a351ed Author: Suresh Marru AuthorDate: Wed May 19 10:51:49 2021 -0400 adding yaml file to configure stagin --- .asf.yaml | 51 +++ 1 file changed, 51 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..c8226e7 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,51 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +notifications: + commits: commits@airavata.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: iss...@airavata.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: iss...@airavata.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: iss...@airavata.apache.org + +github: + description: "Apache Airavata Website" + homepage: https://airavata.apache.org/ + labels: +- airavata +- apache +- security +- oauth2 +- openidconnect +- authentication +- authorization + + features: +wiki: false +issues: true +projects: true + +staging: + profile: ~ + whoami: asf-staging + + +publish: + whoami: asf-site \ No newline at end of file
[airavata-site] branch asf-site updated: updates affiliations
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e8fbbda updates affiliations e8fbbda is described below commit e8fbbda83de925c0d57b909172f7b97f99ea95b6 Author: Suresh Marru AuthorDate: Thu May 6 17:07:59 2021 -0400 updates affiliations --- content/community.html | 20 ++-- source/_data/team.yml | 20 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/content/community.html b/content/community.html index 1a340aa..a4ed377 100644 --- a/content/community.html +++ b/content/community.html @@ -123,15 +123,6 @@ -Thejaka Amila Kanewala -amilaj -amilaj [at] apache [dot] org -Service Now -committer, PMC --8 - - - Anuj Bhandar anujbhan anujbhan [at] apache [dot] org @@ -245,7 +236,7 @@ hasini [at] google [dot] com Google committer --5 +-8 @@ -465,6 +456,15 @@ +Thejaka Amila Kanewala +amilaj +amilaj [at] apache [dot] org +Service Now +committer, PMC +-8 + + + Thilina Gunarathne thilina thilina [at] apache [dot] org diff --git a/source/_data/team.yml b/source/_data/team.yml index dc9501c..917a8c8 100644 --- a/source/_data/team.yml +++ b/source/_data/team.yml @@ -39,13 +39,6 @@ roles: committer, PMC, Incubation Mentor time_zone: "-5" -- name: Amila Jayasekara - apache_id: amilaj - email: amilaj [at] apache [dot] org - organization: Service Now - roles: committer, PMC - time_zone: "-8" - - name: Anuj Bhandar apache_id: anujbhan email: anujbhan [at] apache [dot] org @@ -133,14 +126,14 @@ - name: Hasini Gunasinghe apache_id: hasini email: hasini [at] google [dot] com - organization: Purdue University + organization: Google roles: committer - time_zone: "-5" + time_zone: "-8" - name: Heshan Suriyaarachchi apache_id: heshan email: heshan [at] apache [dot] org - organization: Amazon + organization: Service Now roles: committer, PMC time_zone: "-8" @@ -305,6 +298,13 @@ roles: committer, PMC, PMC Chair time_zone: "-5" +- name: Thejaka Amila Kanewala + apache_id: amilaj + email: amilaj [at] apache [dot] org + organization: Service Now + roles: committer, PMC + time_zone: "-8" + - name: Thilina Gunarathne apache_id: thilina email: thilina [at] apache [dot] org
[airavata] branch master updated: adding apiprod letsencrypt keystore
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 d6ad14d adding apiprod letsencrypt keystore d6ad14d is described below commit d6ad14d1c5ee34ea2cfb4a25379c1209d351a4da Author: Suresh Marru AuthorDate: Thu Mar 25 09:10:44 2021 -0400 adding apiprod letsencrypt keystore --- .../scigap/production/files/letsencrypt_apiprod.jks | Bin 0 -> 4275 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dev-tools/ansible/inventories/scigap/production/files/letsencrypt_apiprod.jks b/dev-tools/ansible/inventories/scigap/production/files/letsencrypt_apiprod.jks new file mode 100644 index 000..a6b5cff Binary files /dev/null and b/dev-tools/ansible/inventories/scigap/production/files/letsencrypt_apiprod.jks differ
[airavata-site] branch asf-site updated: updating team affiliations
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 08cf40c updating team affiliations 08cf40c is described below commit 08cf40c3b4a5925574a6e10c7bd17be923750aac Author: Suresh Marru AuthorDate: Sat Mar 20 18:06:22 2021 -0400 updating team affiliations --- content/about.html | 2 +- content/collaborations.html| 2 +- content/community.html | 10 +- content/consensusBuilding.html | 2 +- content/development.html | 2 +- content/get-involved.html | 2 +- content/gsoc.html | 2 +- content/index.html | 2 +- content/lazy-consensus.html| 2 +- content/learning.html | 2 +- content/logo.html | 2 +- content/mailing-list.html | 2 +- content/submit-patch.html | 2 +- source/_data/team.yml | 8 source/_includes/footer.html | 2 +- source/api-docs/.DS_Store | Bin 0 -> 6148 bytes source/development.md | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/content/about.html b/content/about.html index e099103..07e66f9 100644 --- a/content/about.html +++ b/content/about.html @@ -185,7 +185,7 @@ -Copyright 2016 The Apache Software Foundation, Licensed under the Copyright 2021 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache diff --git a/content/collaborations.html b/content/collaborations.html index b838bc1..bc56ce7 100644 --- a/content/collaborations.html +++ b/content/collaborations.html @@ -295,7 +295,7 @@ -Copyright 2016 The Apache Software Foundation, Licensed under the Copyright 2021 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache diff --git a/content/community.html b/content/community.html index ff0d278..bf2509b 100644 --- a/content/community.html +++ b/content/community.html @@ -99,9 +99,9 @@ Aarushi Bisht aarushi aarushi [at] apache [dot] org -Indiana University +Unity Technologies committer --5 +-8 @@ -144,7 +144,7 @@ Ate Douma ate ate [at] apache [dot] org -Hippo +Bloomreach committer, PMC, Incubation Mentor +1 @@ -477,7 +477,7 @@ Viknes Balasubramanee viknesb viknesb [at] apache [dot] org -Interana +Twitter committer -8 @@ -559,7 +559,7 @@ -Copyright 2016 The Apache Software Foundation, Licensed under the Copyright 2021 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache diff --git a/content/consensusBuilding.html b/content/consensusBuilding.html index 7986dd2..cb83ba7 100644 --- a/content/consensusBuilding.html +++ b/content/consensusBuilding.html @@ -170,7 +170,7 @@ the work under the https://community.apache.org/committers/lazyConsensu -Copyright 2016 The Apache Software Foundation, Licensed under the Copyright 2021 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache diff --git a/content/development.html b/content/development.html index 3d3b2c5..ca1e647 100644 --- a/content/development.html +++ b/content/development.html @@ -503,7 +503,7 @@ -Copyright 2016 The Apache Software Foundation, Licensed under the Copyright 2021 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache Airavata, Airavata, Apache, Apache Airavata Logo and the Apache diff --git a/content/get-involved.html b/content/get-involved.html index 46ef8db..b0de0dd 100644 --- a/content/get-involved.html +++ b/content/get-involved.htm
[airavata-data-lake] 07/09: metadata service neo4j implementation
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit 2724b9a8e90f7a66150b69b359fe319d9b9dba0e Author: Isuru Ranawaka AuthorDate: Wed Mar 10 21:44:02 2021 -0500 metadata service neo4j implementation --- airavata-data-lake.ipr | 112 ++ airavata-data-lake.iws | 418 metadata-service/data-builders/data-builders.iml | 16 + metadata-service/data-builders/pom.xml | 20 + metadata-service/db-service/db-service.iml | 420 + metadata-service/db-service/pom.xml| 49 +++ .../datalake/metadata/db/service/AppConfig.java| 108 ++ .../db/service/Neo4JServiceInitializer.java| 14 + .../metadata/db/service/XmlConfiguration.java | 9 + .../metadata/db/service/backend/Connector.java | 10 + .../metadata/db/service/backend/Person.java| 74 .../db/service/backend/neo4j/Neo4JConnector.java | 53 +++ .../neo4j/curd/operators/GenericService.java | 79 .../backend/neo4j/curd/operators/GroupService.java | 4 + .../neo4j/curd/operators/ResourceService.java | 4 + .../neo4j/curd/operators/SearchOperator.java | 33 ++ .../backend/neo4j/curd/operators/Service.java | 24 ++ .../backend/neo4j/curd/operators/UserService.java | 4 + .../service/backend/neo4j/model/nodes/Entity.java | 109 ++ .../service/backend/neo4j/model/nodes/Group.java | 208 ++ .../backend/neo4j/model/nodes/Resource.java| 215 +++ .../db/service/backend/neo4j/model/nodes/Role.java | 37 ++ .../backend/neo4j/model/nodes/ServiceAccount.java | 29 ++ .../service/backend/neo4j/model/nodes/Tenant.java | 125 ++ .../db/service/backend/neo4j/model/nodes/User.java | 132 +++ .../backend/neo4j/model/relationships/Belongs.java | 9 + .../neo4j/model/relationships/ConfiguredWith.java | 7 + .../backend/neo4j/model/relationships/Has.java | 9 + .../neo4j/model/relationships/HasAccess.java | 23 ++ .../neo4j/model/relationships/HasChildGroup.java | 9 + .../model/relationships/HasChildResource.java | 8 + .../neo4j/model/relationships/HasChildUser.java| 19 + .../neo4j/model/relationships/HasParentGroup.java | 19 + .../model/relationships/HasParentResource.java | 7 + .../backend/neo4j/model/relationships/HasRole.java | 8 + .../neo4j/model/relationships/MemberOf.java| 19 + .../neo4j/model/relationships/Relationship.java| 81 .../neo4j/model/relationships/SharedWith.java | 25 ++ .../service/exceptions/DBConnectorException.java | 10 + .../src/main/resources/application.properties | 23 ++ .../src/main/resources/applicationContext.xml | 12 + metadata-service/metadata-service.iml | 14 + metadata-service/pom.xml | 130 +++ pom.xml| 77 +++- 44 files changed, 2814 insertions(+), 1 deletion(-) diff --git a/airavata-data-lake.ipr b/airavata-data-lake.ipr new file mode 100644 index 000..3bec1ac --- /dev/null +++ b/airavata-data-lake.ipr @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/airavata-data-lake.iws b/airavata-data-lake.iws new file mode 100644 index 000..57de9a0 --- /dev/null +++ b/airavata-data-lake.iws @@ -0,0 +1,418
[airavata-data-lake] 09/09: Merge pull request #1 from isururanawaka/metadata_service
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit d44747ec51d5618683451328703b0866246db988 Merge: ace1dc1 0bac93c Author: Suresh Marru AuthorDate: Wed Mar 17 16:51:36 2021 -0400 Merge pull request #1 from isururanawaka/metadata_service Metadata service airavata-data-lake.ipr | 114 +++ airavata-data-lake.iws | 418 +++ metadata-service/data-builders/data-builders.iml | 16 + metadata-service/data-builders/pom.xml | 20 + metadata-service/db-service/client/client.iml | 109 +++ .../db-service/client/db-service-client.iml| 16 + metadata-service/db-service/client/pom.xml | 28 + .../metadata/clients/MetadataServiceClient.java| 35 + .../clients/MetadataServiceClientBuilder.java | 12 + .../airavata/datalake/metadata/clients/Test.java | 78 ++ metadata-service/db-service/db-service.iml | 420 +++ metadata-service/db-service/pom.xml| 28 + .../db-service/server/db-service-server.iml| 462 metadata-service/db-service/server/pom.xml | 69 ++ metadata-service/db-service/server/server.iml | 109 +++ .../airavata/datalake/metadata/AppConfig.java | 149 .../datalake/metadata/Neo4JServiceInitializer.java | 14 + .../datalake/metadata/XmlConfiguration.java| 9 + .../datalake/metadata/backend/Connector.java | 10 + .../airavata/datalake/metadata/backend/Person.java | 72 ++ .../metadata/backend/neo4j/Neo4JConnector.java | 53 ++ .../neo4j/curd/operators/GenericService.java | 90 +++ .../backend/neo4j/curd/operators/GroupService.java | 4 + .../neo4j/curd/operators/GroupServiceImpl.java | 16 + .../neo4j/curd/operators/ResourceService.java | 4 + .../neo4j/curd/operators/ResourceServiceImpl.java | 16 + .../neo4j/curd/operators/SearchOperator.java | 33 + .../backend/neo4j/curd/operators/Service.java | 27 + .../neo4j/curd/operators/TenantService.java| 4 + .../neo4j/curd/operators/TenantServiceImpl.java| 15 + .../backend/neo4j/curd/operators/UserService.java | 4 + .../neo4j/curd/operators/UserServiceImpl.java | 16 + .../metadata/backend/neo4j/model/nodes/Entity.java | 109 +++ .../metadata/backend/neo4j/model/nodes/Group.java | 208 ++ .../backend/neo4j/model/nodes/Resource.java| 215 ++ .../metadata/backend/neo4j/model/nodes/Role.java | 37 + .../backend/neo4j/model/nodes/ServiceAccount.java | 29 + .../metadata/backend/neo4j/model/nodes/Tenant.java | 125 .../metadata/backend/neo4j/model/nodes/User.java | 132 .../backend/neo4j/model/relationships/Belongs.java | 9 + .../neo4j/model/relationships/ConfiguredWith.java | 7 + .../backend/neo4j/model/relationships/Has.java | 9 + .../neo4j/model/relationships/HasAccess.java | 23 + .../neo4j/model/relationships/HasChildGroup.java | 9 + .../model/relationships/HasChildResource.java | 8 + .../neo4j/model/relationships/HasChildUser.java| 19 + .../neo4j/model/relationships/HasParentGroup.java | 19 + .../model/relationships/HasParentResource.java | 7 + .../backend/neo4j/model/relationships/HasRole.java | 8 + .../neo4j/model/relationships/MemberOf.java| 19 + .../neo4j/model/relationships/Relationship.java| 81 +++ .../neo4j/model/relationships/SharedWith.java | 25 + .../metadata/exceptions/DBConnectorException.java | 10 + .../metadata/handlers/GroupServiceHandler.java | 38 + .../metadata/handlers/ResourceServiceHandler.java | 38 + .../metadata/handlers/TenantServiceHandler.java| 83 +++ .../metadata/handlers/UserServiceHandler.java | 29 + .../datalake/metadata/parsers/GroupParser.java | 68 ++ .../datalake/metadata/parsers/ResourceParser.java | 77 ++ .../datalake/metadata/parsers/TenantParser.java| 79 ++ .../datalake/metadata/parsers/UserParser.java | 22 + .../src/main/resources/application.properties | 23 + .../src/main/resources/applicationContext.xml | 12 + .../db-service/stub/db-service-stub.iml| 84 +++ metadata-service/db-service/stub/pom.xml | 57 ++ .../stub/src/main/proto/common/Common.proto| 12 + .../stub/src/main/proto/group/Group.proto | 88 +++ .../stub/src/main/proto/resource/Resource.proto| 97 +++ .../stub/src/main/proto/tenant/Tenant.proto| 67 ++ .../db-service/stub/src/main/proto/user/User.proto | 66 ++ metadata-service/db-service/stub/stub.iml | 111 +++ metadata-service/metadata-service.iml | 804 + metadata-service/pom.xml | 69 ++ pom.xml| 80 +- 74 files changed, 5581 insertions
[airavata-data-lake] 06/09: Adding repository support for SFTP Remotes
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit ace1dc1bdfd9b3058574686cb1fc719901700bd8 Author: Dimuthu Wannipurage AuthorDate: Tue Jan 5 19:00:19 2021 -0500 Adding repository support for SFTP Remotes --- data-orchestrator/data-orchestrator-api/pom.xml| 19 +++ .../api/controller/remote/SFTPController.java | 46 +-- .../api/db/entity/SFTPCredentialEntity.java| 140 + .../api/db/entity/SFTPRemoteEntity.java| 92 ++ .../api/db/repo/SFTPCredentialRepository.java | 26 .../api/db/repo/SFTPRemoteRepository.java | 26 6 files changed, 337 insertions(+), 12 deletions(-) diff --git a/data-orchestrator/data-orchestrator-api/pom.xml b/data-orchestrator/data-orchestrator-api/pom.xml index c840c04..e6433cb 100644 --- a/data-orchestrator/data-orchestrator-api/pom.xml +++ b/data-orchestrator/data-orchestrator-api/pom.xml @@ -41,6 +41,25 @@ org.springframework.boot +spring-boot-starter-data-jpa +2.4.1 + + + +net.sf.dozer +dozer +5.5.1 + + + +com.h2database +h2 +1.4.197 +runtime + + + +org.springframework.boot spring-boot-starter-test test diff --git a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/remote/SFTPController.java b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/remote/SFTPController.java index 5492889..e7bced6 100644 --- a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/remote/SFTPController.java +++ b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/remote/SFTPController.java @@ -19,39 +19,61 @@ */ package org.apache.airavata.datalake.orchestrator.api.controller.remote; -import org.apache.airavata.datalake.orchestrator.api.model.remote.SFTPCredential; +import org.apache.airavata.datalake.orchestrator.api.db.entity.SFTPRemoteEntity; +import org.apache.airavata.datalake.orchestrator.api.db.repo.SFTPRemoteRepository; import org.apache.airavata.datalake.orchestrator.api.model.remote.SFTPRemote; +import org.dozer.DozerBeanMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; + +import java.util.Optional; @RestController @RequestMapping(path = "/remotes/sftp") public class SFTPController { +@Autowired +private SFTPRemoteRepository sftpRemoteRepository; + @GetMapping(value = "/{remoteId}", produces = "application/json") public SFTPRemote fetchSFTPRemote(@PathVariable(name = "remoteId") String remoteId) { -return new SFTPRemote() -.setHost("localhost") -.setPort(22) -.setCredential( -new SFTPCredential() -.setAuthMethod(SFTPCredential.AuthMethod.SSH_KEY) -.setPrivateKey("") -.setPublicKey("")); + +Optional entityOp = sftpRemoteRepository.findById(remoteId); +SFTPRemoteEntity sftpRemoteEntity = entityOp.orElseThrow( +() -> new ResponseStatusException(HttpStatus.NOT_FOUND, remoteId + " not found")); +DozerBeanMapper mapper = new DozerBeanMapper(); +return mapper.map(sftpRemoteEntity, SFTPRemote.class); } @PostMapping(value = "") public String createSFTPRemote(@RequestBody SFTPRemote sftpRemote) { -return "Remote id"; + +DozerBeanMapper mapper = new DozerBeanMapper(); +SFTPRemoteEntity sftpRemoteEntity = mapper.map(sftpRemote, SFTPRemoteEntity.class); +SFTPRemoteEntity saved = sftpRemoteRepository.save(sftpRemoteEntity); +return saved.getId(); } @PutMapping(value = "/{remoteId}") public String updateSFTPRemote(@RequestBody SFTPRemote sftpRemote, @PathVariable(name = "remoteId") String remoteId) { -return "Remote id"; + +DozerBeanMapper mapper = new DozerBeanMapper(); +SFTPRemoteEntity sftpRemoteEntity = mapper.map(sftpRemote, SFTPRemoteEntity.class); +sftpRemoteEntity.setId(remoteId); +SFTPRemoteEntity saved = sftpRemoteRepository.save(sftpRemoteEntity); +return saved.getId();
[airavata-data-lake] 01/09: bootstrapping git repo
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit 3ed323a81d93a2da0cad1e748bc6e825102cb06d Author: Suresh Marru AuthorDate: Tue Nov 10 13:02:25 2020 -0500 bootstrapping git repo --- README.md | 35 +++ 1 file changed, 35 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..fd06c5a --- /dev/null +++ b/README.md @@ -0,0 +1,35 @@ + +# Apache Airavata Data Lake + +[![License](http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat)](https://apache.org/licenses/LICENSE-2.0) + +Apache Airavata use cases enable capture of data from observational and experimental instruments and computations resulting from Airavata's orchestration capabilities. As the data deluges into vast amounts, harvesting the data, capturing metadata, presenting it for easy and controlled access becomes unmanageable. + +Airavata data lake will bundle stand alone services to catalog data in various data stores, extract and capture semantics and metadata descriptions of the data and preserve associated data provenance. The data lake will provide API's, query and search capabilities to programmatically search and retrieve data and power building user interactivity and data analysis applications on top of it. + +![Airavata Data Lake Overview](https://cwiki.apache.org/confluence/download/attachments/165224787/Airavata%20Data%20Lake.png?version=1=160502062=v2) + +Airavata Data Lake will provide file watcher and other trigger capabilities to ingest data from scientific instruments as they become available. The framwork will enable pluggable data parsers to read structured and unstructured data files and extract meaningful descriptions. + +A bundled Data replica catalogs will associate pointers to data at multiple storgae locations. The replica catalog maps logical file names to the physical locations. Data Lake client SDK's will provide API functions to query replica location and resolve into multiple physical file locations. The client will be bundled with access protocols to retrive the data or to embedd into computational pipelines. + +Interfacing with Airavata [Managed File Transfer Service](https://github.com/apache/airavata-mft) Data can moved and archiving into longer term persistant storages like tapped archives. The Data archives will be indexed and have search capabilities + +Data Lake's provenance will provide information to capture parameters influenced the production or modification of the data. An abstraction API will enable plugging fine granted provenance based on Airavata tentant context. Interfacing with Airavata Orchestration Services, pointers to experiment catalog will enable restructuring of the underting computations. \ No newline at end of file
[airavata-data-lake] 03/09: Enabling the travis build
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit 10266978c902a3db2b7ae540f9563e373175eb97 Author: Dimuthu Wannipurage AuthorDate: Fri Dec 11 04:22:36 2020 -0500 Enabling the travis build --- .gitignore | 6 +- .travis.yml | 36 pom.xml | 15 ++- 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5559ec0..753237f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,8 @@ airavata-data-lake.iml data-orchestrator/data-orchestrator.iml data-orchestrator/data-orchestrator-api/data-orchestrator-api.iml -data-orchestrator/data-orchestrator-core/data-orchestrator-core.iml \ No newline at end of file +data-orchestrator/data-orchestrator-core/data-orchestrator-core.iml +target/ +data-orchestrator/target +data-orchestrator/data-orchestrator-core/target +data-orchestrator/data-orchestrator-api/target \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..9f37705 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,36 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +language: java + +sudo: false + +notifications: + email: +on_success: change +on_failure: always + +jdk: + - oraclejdk11 + +script: mvn clean install + +# Git-describe Maven plugin needs the full history +git: + depth: false diff --git a/pom.xml b/pom.xml index b3e53b6..48bcf01 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,19 @@ https://issues.apache.org/jira/browse/AIRAVATA - + + + +org.apache.maven.plugins +maven-compiler-plugin +3.6.1 + +11 +11 +true + + + +
[airavata-data-lake] 02/09: Initial project structure for data orchestrator
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit 1eb8a81b7e8fe7de1d4589833ad5358ea85195b2 Author: Dimuthu Wannipurage AuthorDate: Fri Dec 11 04:19:07 2020 -0500 Initial project structure for data orchestrator --- .gitignore | 5 ++ data-orchestrator/data-orchestrator-api/pom.xml| 15 ++ .../datalake/orchestrator/api/Application.java | 26 ++ data-orchestrator/data-orchestrator-core/pom.xml | 15 ++ .../orchestrator/core/task/AbstractTask.java | 26 ++ data-orchestrator/pom.xml | 20 pom.xml| 55 ++ 7 files changed, 162 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..5559ec0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.idea/* +airavata-data-lake.iml +data-orchestrator/data-orchestrator.iml +data-orchestrator/data-orchestrator-api/data-orchestrator-api.iml +data-orchestrator/data-orchestrator-core/data-orchestrator-core.iml \ No newline at end of file diff --git a/data-orchestrator/data-orchestrator-api/pom.xml b/data-orchestrator/data-orchestrator-api/pom.xml new file mode 100644 index 000..720bd6c --- /dev/null +++ b/data-orchestrator/data-orchestrator-api/pom.xml @@ -0,0 +1,15 @@ + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + +data-orchestrator +org.apache.airavata.data.lake +0.01-SNAPSHOT + +4.0.0 + +data-orchestrator-api + + + \ No newline at end of file diff --git a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java new file mode 100644 index 000..dc91369 --- /dev/null +++ b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java @@ -0,0 +1,26 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.airavata.datalake.orchestrator.api; + +/** + * TODO: Spring Boot API + */ +public class Application { +} diff --git a/data-orchestrator/data-orchestrator-core/pom.xml b/data-orchestrator/data-orchestrator-core/pom.xml new file mode 100644 index 000..583e58a --- /dev/null +++ b/data-orchestrator/data-orchestrator-core/pom.xml @@ -0,0 +1,15 @@ + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + +data-orchestrator +org.apache.airavata.data.lake +0.01-SNAPSHOT + +4.0.0 + +data-orchestrator-core + + + \ No newline at end of file diff --git a/data-orchestrator/data-orchestrator-core/src/main/java/org/apache/airavata/datalake/orchestrator/core/task/AbstractTask.java b/data-orchestrator/data-orchestrator-core/src/main/java/org/apache/airavata/datalake/orchestrator/core/task/AbstractTask.java new file mode 100644 index 000..1072614 --- /dev/null +++ b/data-orchestrator/data-orchestrator-core/src/main/java/org/apache/airavata/datalake/orchestrator/core/task/AbstractTask.java @@ -0,0 +1,26 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed t
[airavata-data-lake] 05/09: Initial framework for orchestrator API
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit 5c072e3b648a1b56f7aa19910764f83df6ca3f14 Author: Dimuthu Wannipurage AuthorDate: Tue Jan 5 04:51:42 2021 -0500 Initial framework for orchestrator API --- data-orchestrator/data-orchestrator-api/pom.xml| 51 ++ .../datalake/orchestrator/api/Application.java | 7 ++ .../HookController.java} | 7 +- .../api/controller/TransferController.java | 48 + .../api/controller/remote/SFTPController.java | 57 +++ .../orchestrator/api/model/TransferEntry.java | 75 ++ .../api/model/remote/SFTPCredential.java | 110 + .../orchestrator/api/model/remote/SFTPRemote.java | 73 ++ data-orchestrator/pom.xml | 21 9 files changed, 444 insertions(+), 5 deletions(-) diff --git a/data-orchestrator/data-orchestrator-api/pom.xml b/data-orchestrator/data-orchestrator-api/pom.xml index 720bd6c..c840c04 100644 --- a/data-orchestrator/data-orchestrator-api/pom.xml +++ b/data-orchestrator/data-orchestrator-api/pom.xml @@ -1,4 +1,25 @@ + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> @@ -11,5 +32,35 @@ data-orchestrator-api + + +org.springframework.boot +spring-boot-starter-web +2.4.1 + + + +org.springframework.boot +spring-boot-starter-test +test + + +org.junit.vintage +junit-vintage-engine + + +2.4.1 + + + + + + +org.springframework.boot +spring-boot-maven-plugin +2.4.1 + + + \ No newline at end of file diff --git a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java index dc91369..df78fc2 100644 --- a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java +++ b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java @@ -19,8 +19,15 @@ */ package org.apache.airavata.datalake.orchestrator.api; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + /** * TODO: Spring Boot API */ +@SpringBootApplication public class Application { +public static void main(String[] args) { +SpringApplication.run(Application.class, args); +} } diff --git a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/HookController.java similarity index 87% copy from data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java copy to data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/HookController.java index dc91369..c171681 100644 --- a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/Application.java +++ b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/HookController.java @@ -17,10 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.datalake.orchestrator.api; +package org.apache.airavata.datalake.orchestrator.api.controller; -/** - * TODO: Spring Boot API - */ -public class Application { +public class HookController { } diff --git a/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/TransferController.java b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/TransferController.java new file mode 100644 index 000..5e5b04c --- /dev/null +++ b/data-orchestrator/data-orchestrator-api/src/main/java/org/apache/airavata/datalake/orchestrator/api/controller/TransferController.java @@ -0,0 +1,48 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information
[airavata-data-lake] branch metadata-service updated (ace1dc1 -> d44747e)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git. from ace1dc1 Adding repository support for SFTP Remotes new 2724b9a metadata service neo4j implementation new 0bac93c gRCP saving path new d44747e Merge pull request #1 from isururanawaka/metadata_service The 9 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: airavata-data-lake.ipr | 114 +++ airavata-data-lake.iws | 418 +++ metadata-service/data-builders/data-builders.iml | 16 + .../data-builders}/pom.xml | 9 +- metadata-service/db-service/client/client.iml | 109 +++ .../db-service/client/db-service-client.iml| 16 + metadata-service/db-service/client/pom.xml | 28 + .../metadata/clients/MetadataServiceClient.java| 35 + .../clients/MetadataServiceClientBuilder.java | 12 + .../airavata/datalake/metadata/clients/Test.java | 78 ++ metadata-service/db-service/db-service.iml | 420 +++ metadata-service/db-service/pom.xml| 28 + .../db-service/server/db-service-server.iml| 462 metadata-service/db-service/server/pom.xml | 69 ++ metadata-service/db-service/server/server.iml | 109 +++ .../airavata/datalake/metadata/AppConfig.java | 149 .../datalake/metadata/Neo4JServiceInitializer.java | 14 + .../datalake/metadata/XmlConfiguration.java| 9 + .../datalake/metadata/backend/Connector.java | 10 + .../airavata/datalake/metadata/backend/Person.java | 72 ++ .../metadata/backend/neo4j/Neo4JConnector.java | 53 ++ .../neo4j/curd/operators/GenericService.java | 90 +++ .../backend/neo4j/curd/operators/GroupService.java | 4 + .../neo4j/curd/operators/GroupServiceImpl.java | 16 + .../neo4j/curd/operators/ResourceService.java | 4 + .../neo4j/curd/operators/ResourceServiceImpl.java | 16 + .../neo4j/curd/operators/SearchOperator.java | 33 + .../backend/neo4j/curd/operators/Service.java | 27 + .../neo4j/curd/operators/TenantService.java| 4 + .../neo4j/curd/operators/TenantServiceImpl.java| 15 + .../backend/neo4j/curd/operators/UserService.java | 4 + .../neo4j/curd/operators/UserServiceImpl.java | 16 + .../metadata/backend/neo4j/model/nodes/Entity.java | 109 +++ .../metadata/backend/neo4j/model/nodes/Group.java | 208 ++ .../backend/neo4j/model/nodes/Resource.java| 215 ++ .../metadata/backend/neo4j/model/nodes/Role.java | 37 + .../backend/neo4j/model/nodes/ServiceAccount.java | 29 + .../metadata/backend/neo4j/model/nodes/Tenant.java | 125 .../metadata/backend/neo4j/model/nodes/User.java | 132 .../backend/neo4j/model/relationships/Belongs.java | 9 + .../neo4j/model/relationships/ConfiguredWith.java | 7 + .../backend/neo4j/model/relationships/Has.java | 9 + .../neo4j/model/relationships/HasAccess.java | 23 + .../neo4j/model/relationships/HasChildGroup.java | 9 + .../model/relationships/HasChildResource.java | 8 + .../neo4j/model/relationships/HasChildUser.java| 19 + .../neo4j/model/relationships/HasParentGroup.java | 19 + .../model/relationships/HasParentResource.java | 7 + .../backend/neo4j/model/relationships/HasRole.java | 8 + .../neo4j/model/relationships/MemberOf.java| 19 + .../neo4j/model/relationships/Relationship.java| 81 +++ .../neo4j/model/relationships/SharedWith.java | 25 + .../metadata/exceptions/DBConnectorException.java | 10 + .../metadata/handlers/GroupServiceHandler.java | 38 + .../metadata/handlers/ResourceServiceHandler.java | 38 + .../metadata/handlers/TenantServiceHandler.java| 83 +++ .../metadata/handlers/UserServiceHandler.java | 29 + .../datalake/metadata/parsers/GroupParser.java | 68 ++ .../datalake/metadata/parsers/ResourceParser.java | 77 ++ .../datalake/metadata/parsers/TenantParser.java| 79 ++ .../datalake/metadata/parsers/UserParser.java | 22 + .../src/main/resources/application.properties | 23 + .../src/main/resources/applicationContext.xml | 12 + .../db-service/stub/db-service-stub.iml| 84 +++ metadata-service/db-service/stub/pom.xml | 57 ++ .../stub/src/main/proto/common/Common.proto| 12 + .../stub/src/main/proto/group/Group.proto | 88 +++ .../stub/src/main/proto/resource/Resource.proto| 97 +++ .../stub/src/main/proto/tenant/Tenant.proto| 67 ++ .../db-service/stub/src/main/proto/user/User.proto | 66 ++ metadata-ser
[airavata-data-lake] 04/09: Showing the latest build status
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch metadata-service in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git commit d760234496163a8064b77373cfe762a4367b Author: Dimuthu Wannipurage AuthorDate: Fri Dec 11 04:26:20 2020 -0500 Showing the latest build status --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fd06c5a..2c0476f 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ # Apache Airavata Data Lake [![License](http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat)](https://apache.org/licenses/LICENSE-2.0) +[![Build Status](https://travis-ci.org/apache/airavata-data-lake.svg?branch=master)](https://travis-ci.org/apache/airavata-data-lake) Apache Airavata use cases enable capture of data from observational and experimental instruments and computations resulting from Airavata's orchestration capabilities. As the data deluges into vast amounts, harvesting the data, capturing metadata, presenting it for easy and controlled access becomes unmanageable.
[airavata-site] branch asf-site updated: homepage, add a space
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 313f96e homepage, add a space new f3c4528 Merge pull request #5 from karoka/asf-site 313f96e is described below commit 313f96eca18f8964ba6d09ff25da012773ad21a5 Author: karoka AuthorDate: Tue Feb 25 17:03:02 2020 -0500 homepage, add a space --- content/index.html | 2 +- source/index.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/index.html b/content/index.html index 7f7f41d..8c1a5b2 100644 --- a/content/index.html +++ b/content/index.html @@ -68,7 +68,7 @@ -Apache AiravataTM is a software framework that enables you to compose, manage, execute, and monitor large scale applications and workflows on distributed computing resources such as local clusters, supercomputers,computational grids, and computing clouds. +Apache AiravataTM is a software framework that enables you to compose, manage, execute, and monitor large scale applications and workflows on distributed computing resources such as local clusters, supercomputers, computational grids, and computing clouds. diff --git a/source/index.md b/source/index.md index 7ea368c..2bfaebd 100644 --- a/source/index.md +++ b/source/index.md @@ -9,7 +9,7 @@ layout: default -Apache AiravataTM is a software framework that enables you to compose, manage, execute, and monitor large scale applications and workflows on distributed computing resources such as local clusters, supercomputers,computational grids, and computing clouds. +Apache AiravataTM is a software framework that enables you to compose, manage, execute, and monitor large scale applications and workflows on distributed computing resources such as local clusters, supercomputers, computational grids, and computing clouds.
[airavata-site] branch asf-site updated: Tiny typo
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 76098d5 Tiny typo new 8d62ba8 Merge pull request #6 from rbowen/patch-1 76098d5 is described below commit 76098d50f4cf1dbcaa7d075d3b63e86adb2032f8 Author: Rich Bowen AuthorDate: Fri Mar 27 13:44:18 2020 -0400 Tiny typo s/availalbe/available/ --- content/development.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/development.html b/content/development.html index 0808d44..c03983a 100644 --- a/content/development.html +++ b/content/development.html @@ -180,7 +180,7 @@ Airavata Web Site -The Apache Airavata website is availalbe from Apache's Git repository and mirrored in +The Apache Airavata website is available from Apache's Git repository and mirrored in GitHub.
[airavata-docs] branch master updated: Changing API documentation to latest master
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-docs.git The following commit(s) were added to refs/heads/master by this push: new 4392300 Changing API documentation to latest master 4392300 is described below commit 439230079e936ba8cd304e8beac75cf99c11c3d3 Author: Suresh Marru AuthorDate: Thu Feb 18 17:29:33 2021 -0500 Changing API documentation to latest master --- docs/technical-documentation/airavata-api.md | 86 +++- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/docs/technical-documentation/airavata-api.md b/docs/technical-documentation/airavata-api.md index db615a5..2464608 100644 --- a/docs/technical-documentation/airavata-api.md +++ b/docs/technical-documentation/airavata-api.md @@ -1,30 +1,34 @@ ## Apache Airavata API -For Airavata API documentation please visit http://airavata.apache.org/api-docs/0.16/; target="_blank">Airavata 0.16 API Documentation +For latest Airavata API documentation please visit http://airavata.apache.org/api-docs/master/; target="_blank">Airavata Master Branch (0.20) API Documentation + +Legacy Airavata API documentation please visit: +http://airavata.apache.org/api-docs/0.16/; target="_blank">Airavata 0.16 API Documentation + ### Airavata APIs for Experiments & Projects | Gateway Function/Feature| Airavata API| Description | |:--|:--|:--| Project -| Create a Project | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_createProject; target="_blank">createProject | Linked with Create Project in PGA.| -| Update Project| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_updateProject; target="_blank">updateProject | To update Project name and description. | -| Get a Project | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getProject; target="_blank">getProject| Retrieve Project by providing the ID. | -| Search Project by Name| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchProjectsByProjectName; target="_blank">searchProjectsByProjectName | Search for Project by giving part or full project name. | -| Search Project by Desc| http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_searchProjectsByProjectDesc; target="_blank">searchProjectsByProjectDesc | Search for Project by giving part or full project description. | -| Get all user Projects | http://airavata.apache.org/api-docs/0.16/airavata_api.html#Fn_Airavata_getUserProjects; target="_blank">getUserProjects | Retrieve all Projects of a user. | +| Create a Project | https://airavata.apache.org/api-docs/master/airavata_api.html#Fn_Airavata_createProject; target="_blank">createProject | Linked with Create Project in PGA.| +| Update Project| https://airavata.apache.org/api-docs/master/airavata_api.html#Fn_Airavata_updateProject; target="_blank">updateProject | To update Project name and description. | +| Get a Project | https://airavata.apache.org/api-docs/master/airavata_api.html#Fn_Airavata_getProject; target="_blank">getProject| Retrieve Project by providing the ID. | +| Search Project by Name| https://airavata.apache.org/api-docs/master/airavata_api.html#Fn_Airavata_searchProjectsByProjectName; target="_blank">searchProjectsByProjectName | Search for Project by giving part or full project name. | +| Search Project by Desc| https://airavata.apache.org/api-docs/master/airavata_api.html#Fn_Airavata_searchProjectsByProjectDesc; target="_blank">searchProjectsByProjectDesc | Search for Project by giving part or full project description. | +| Get all user Projects | https://airavata.apache.org/api-docs/master/airavata_api.html#Fn_Airavata_getUserProjects; target="_blank">getUserProjects | Retrieve all Projects of a user. | Experiment -| Create an Experiment
[airavata-site] branch asf-site updated: deleting jekyll cache files
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 19f6b5f deleting jekyll cache files 19f6b5f is described below commit 19f6b5f7cdb809ba2067f0685e715cf1e52f550d Author: Suresh Marru AuthorDate: Sun Jan 10 13:05:39 2021 -0500 deleting jekyll cache files --- .gitignore | 1 + ...609ed40b622142f1c98125abcfe89a76a661b0e8e343910 | 1 - ...1a671e2ee900a3a58c53ae94ea1401f16f2dbc07414ff2c | 163 ...9c824944eac78e44f64eddfb7c7979c65f7a8cf46580c47 | 53 --- ...345ce4aba7ac7f0528154f3bbdbcfa4198093b46364512a | 87 - ...6a46a9203715db1e5012f466a112ac879cb1557ac5909d4 | 146 --- ...91e820783c45095900bdfbba211ff18cf2d0c1ffab160aa | 17 - ...b465cdabef43ccc4010aedf59a3b393f8765978d3d17beb | 116 -- ...5019a6c0edac0eeb9df286d45c5f2c2bd18c09ebe3dd901 | 46 --- ...72f4a28dc0ba0149f8eb8086ec651e6c2bab9c6b916a0cb | 43 --- ...7b97451a103074ce27c18b8341e5fecfc68ed87ae941d3a | 427 - ...ff707b5f21de916ad0470c2aa93786bb8911b4a694dbb9b | 113 -- ...51fa97d84fa7a053a888fe71a4d9205a20fd94ae787e65c | 276 - 13 files changed, 1 insertion(+), 1488 deletions(-) diff --git a/.gitignore b/.gitignore index fd24be2..33caefb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ source/.sass-cache/ /source/.jekyll-cache/ /.jekyll-cache/ +/.jekyll-cache/ diff --git a/source/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 b/source/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 deleted file mode 100644 index 7d71082..000 --- a/source/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 +++ /dev/null @@ -1 +0,0 @@ -I"{"source"=>"/Users/smarru/websites/airavata-site/source", "destination"=>"../content", "collections_dir"=>"", "cache_dir"=>".jekyll-cache", "plugins_dir"=>"_plugins", "layouts_dir"=>"_layouts", "data_dir"=>"_data", "includes_dir"=>"_includes", "collections"=>{"posts"=>{"output"=>true, "permalink"=>"/:categories/:year/:month/:day/:title:output_ext"}, "airavata_team"=>{}}, "safe"=>false, "include"=>[".htaccess"], "exclude"=>[".sass-cache", ".jekyll-cache", "gemfiles", "Gemfile", "Ge [...] \ No newline at end of file diff --git a/source/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/16/843fac9b3ef92561a671e2ee900a3a58c53ae94ea1401f16f2dbc07414ff2c b/source/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/16/843fac9b3ef92561a671e2ee900a3a58c53ae94ea1401f16f2dbc07414ff2c deleted file mode 100644 index 54431b1..000 --- a/source/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/16/843fac9b3ef92561a671e2ee900a3a58c53ae94ea1401f16f2dbc07414ff2c +++ /dev/null @@ -1,163 +0,0 @@ -I"� - - Our Collaborators and Clients - Domain and Application Gateways - - - - - Title - Field of Science - - - - - https://seagrid.org/; target="_blank">SEAGrid Gateway - Chemistry Engineering - - - http://wiki.bcf2.uthscsa.edu/limsv3/; target="_blank">Ultrascan Gateway - Biophysics - - - https://www.phylo.org/; target="_blank">CIPRES Gateway - Systematic Population Biology - - - http://www.nsgportal.org/; target="_blank">NSG Gateway - Neuroscience Biology - - - https://testdrive.airavata.org/; target="_blank">PGA - Computer Information Science Engineering - - - https://dreg.dnasequence.org/; target="_blank">dREG Gateway - Genetics Nucleic Acids - - - https://phasta.scigap.org/; target="_blank">Phasta Gateway - Mechanical Engineering - - - https://geosurveyiu.scigap.org/; target="_blank">SimCCS Gateway - Geology Survey - -
[airavata-site] branch asf-site updated: adding pointer to release wiki
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e19aa6c adding pointer to release wiki e19aa6c is described below commit e19aa6c0809353ae2f3e8dd183fe0f8c1f86eb38 Author: Suresh Marru AuthorDate: Sun Jan 10 13:02:51 2021 -0500 adding pointer to release wiki --- content/assets/css/main.css| 13 +- content/assets/css/main.css.map| 2 +- content/development.html | 5 + ...609ed40b622142f1c98125abcfe89a76a661b0e8e343910 | 2 +- ...b28bc45b8ecf490184e62c01ad2421ac4b5e1e908da7234 | 382 - ...3020cdbd0e0f84b9ffd0188135f4e4de676605ce21930e5 | 147 ...e8a3ce5912990d5b529227a1861146e6ff045506644579e | 382 - source/development.md | 6 + 8 files changed, 16 insertions(+), 923 deletions(-) diff --git a/content/assets/css/main.css b/content/assets/css/main.css index 1bdf35d..05cea81 100644 --- a/content/assets/css/main.css +++ b/content/assets/css/main.css @@ -50,7 +50,7 @@ pre > code { border: 0; padding-right: 0; padding-left: 0; } @media screen and (max-width: 800px) { .wrapper { max-width: -webkit-calc(800px - (30x)); max-width: calc(800px - (30x)); padding-right: 15x; padding-left: 15x; } } /** Clearfix */ -.wrapper:after, .footer-col-wrapper:after { content: ""; display: table; clear: both; } +.footer-col-wrapper:after, .wrapper:after { content: ""; display: table; clear: both; } /** Icons */ .icon > svg { display: inline-block; width: 16px; height: 16px; vertical-align: middle; } @@ -72,13 +72,7 @@ pre > code { border: 0; padding-right: 0; padding-left: 0; } .site-nav .page-link:not(:first-child) { margin-left: 20px; } -@media screen and (max-width: 600px) { .site-nav { position: absolute; top: 9px; right: 30px; background-color: #fdfdfd; border: 1px solid #e8e8e8; border-radius: 5px; text-align: right; } - .site-nav .menu-icon { display: block; float: right; width: 36px; height: 26px; line-height: 0; padding-top: 10px; text-align: center; } - .site-nav .menu-icon > svg { width: 18px; height: 15px; } - .site-nav .menu-icon > svg path { fill: #424242; } - .site-nav .trigger { clear: both; display: none; } - .site-nav:hover .trigger { display: block; padding-bottom: 5px; } - .site-nav .page-link { display: block; padding: 5px 10px; } } +@media screen and (max-width: 600px) { .site-nav { position: absolute; top: 9px; right: 30px; background-color: #fdfdfd; border: 1px solid #e8e8e8; border-radius: 5px; text-align: right; } .site-nav .menu-icon { display: block; float: right; width: 36px; height: 26px; line-height: 0; padding-top: 10px; text-align: center; } .site-nav .menu-icon > svg { width: 18px; height: 15px; } .site-nav .menu-icon > svg path { fill: #424242; } .site-nav .trigger { clear: both; display: none; } .site- [...] /** Site footer */ .site-footer { border-top: 1px solid #e8e8e8; padding: 30x 0; } @@ -97,8 +91,7 @@ pre > code { border: 0; padding-right: 0; padding-left: 0; } .footer-col-3 { width: -webkit-calc(45% - (30x / 2)); width: calc(45% - (30x / 2)); } -@media screen and (max-width: 800px) { .footer-col-1, .footer-col-2 { width: -webkit-calc(50% - (30x / 2)); width: calc(50% - (30x / 2)); } - .footer-col-3 { width: -webkit-calc(100% - (30x / 2)); width: calc(100% - (30x / 2)); } } +@media screen and (max-width: 800px) { .footer-col-1, .footer-col-2 { width: -webkit-calc(50% - (30x / 2)); width: calc(50% - (30x / 2)); } .footer-col-3 { width: -webkit-calc(100% - (30x / 2)); width: calc(100% - (30x / 2)); } } @media screen and (max-width: 600px) { .footer-col { float: none; width: -webkit-calc(100% - (30x / 2)); width: calc(100% - (30x / 2)); } } diff --git a/content/assets/css/main.css.map b/content/assets/css/main.css.map index 0cc0169..87e4699 100644 --- a/content/assets/css/main.css.map +++ b/content/assets/css/main.css.map @@ -14,5 +14,5 @@ "/**\n * Syntax highlighting styles\n */\n.highlight {\n background: #fff;\n@extend %vertical-rhythm;\n\n.c { color: #998; font-style: italic } // Comment\n.err { color: #a61717; background-color: #e3d2d2 } // Error\n.k { font-weight: bold } // Keyword\n.o { font-weight: bold } // Operator\n.cm{ color: #998; font-style: italic } // Comment.Multiline\n.cp{ color: #999; font-weight: bold } // Comment.Preproc\n.c1{ color: #998; [...] ], "names": [], - "mappings": "ACAA,gCAEG;AACH,,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAC5B,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,EACtB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EACnB,MAAM,EA
[airavata-data-lake] 01/01: bootstrapping git repo
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-data-lake.git commit 3ed323a81d93a2da0cad1e748bc6e825102cb06d Author: Suresh Marru AuthorDate: Tue Nov 10 13:02:25 2020 -0500 bootstrapping git repo --- README.md | 35 +++ 1 file changed, 35 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..fd06c5a --- /dev/null +++ b/README.md @@ -0,0 +1,35 @@ + +# Apache Airavata Data Lake + +[![License](http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat)](https://apache.org/licenses/LICENSE-2.0) + +Apache Airavata use cases enable capture of data from observational and experimental instruments and computations resulting from Airavata's orchestration capabilities. As the data deluges into vast amounts, harvesting the data, capturing metadata, presenting it for easy and controlled access becomes unmanageable. + +Airavata data lake will bundle stand alone services to catalog data in various data stores, extract and capture semantics and metadata descriptions of the data and preserve associated data provenance. The data lake will provide API's, query and search capabilities to programmatically search and retrieve data and power building user interactivity and data analysis applications on top of it. + +![Airavata Data Lake Overview](https://cwiki.apache.org/confluence/download/attachments/165224787/Airavata%20Data%20Lake.png?version=1=160502062=v2) + +Airavata Data Lake will provide file watcher and other trigger capabilities to ingest data from scientific instruments as they become available. The framwork will enable pluggable data parsers to read structured and unstructured data files and extract meaningful descriptions. + +A bundled Data replica catalogs will associate pointers to data at multiple storgae locations. The replica catalog maps logical file names to the physical locations. Data Lake client SDK's will provide API functions to query replica location and resolve into multiple physical file locations. The client will be bundled with access protocols to retrive the data or to embedd into computational pipelines. + +Interfacing with Airavata [Managed File Transfer Service](https://github.com/apache/airavata-mft) Data can moved and archiving into longer term persistant storages like tapped archives. The Data archives will be indexed and have search capabilities + +Data Lake's provenance will provide information to capture parameters influenced the production or modification of the data. An abstraction API will enable plugging fine granted provenance based on Airavata tentant context. Interfacing with Airavata Orchestration Services, pointers to experiment catalog will enable restructuring of the underting computations. \ No newline at end of file
[airavata-data-lake] branch master created (now 3ed323a)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git. at 3ed323a bootstrapping git repo This branch includes the following new commits: new 3ed323a bootstrapping git repo The 1 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.
[airavata-site] branch asf-site updated: changing git url
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 6d1f4bd changing git url 6d1f4bd is described below commit 6d1f4bd153da04492bf50d4b90fb098aeba93009 Author: Suresh Marru AuthorDate: Tue Oct 13 23:27:55 2020 -0400 changing git url --- content/custos/index.html | 2 +- source/custos/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/custos/index.html b/content/custos/index.html index a92c278..5511941 100644 --- a/content/custos/index.html +++ b/content/custos/index.html @@ -53,7 +53,7 @@ alt="Custos Logo" class="ui centered small image"> -https://github.com/apache/airavata-custos/tree/develop; target="_blank" class="ui button black"> GitHub +https://github.com/apache/airavata-custos; target="_blank" class="ui button black"> GitHub diff --git a/source/custos/index.html b/source/custos/index.html index a92c278..5511941 100644 --- a/source/custos/index.html +++ b/source/custos/index.html @@ -53,7 +53,7 @@ alt="Custos Logo" class="ui centered small image"> -https://github.com/apache/airavata-custos/tree/develop; target="_blank" class="ui button black"> GitHub +https://github.com/apache/airavata-custos; target="_blank" class="ui button black"> GitHub
[airavata-site] branch asf-site updated: Changing custos git link to master
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e15a589 Changing custos git link to master e15a589 is described below commit e15a589e3435fed43de6ffe9e17299204bd1e56e Author: Suresh Marru AuthorDate: Tue Oct 13 23:25:35 2020 -0400 Changing custos git link to master --- content/custos/index.html | 2 +- source/custos/.DS_Store | Bin 0 -> 6148 bytes source/custos/index.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/custos/index.html b/content/custos/index.html index c87a027..a92c278 100644 --- a/content/custos/index.html +++ b/content/custos/index.html @@ -31,7 +31,7 @@ Partners Contact -https://github.com/apache/airavata-custos/tree/develop; target="_blank"> GitHub +https://github.com/apache/airavata-custos; target="_blank"> GitHub diff --git a/source/custos/.DS_Store b/source/custos/.DS_Store new file mode 100644 index 000..9e6f774 Binary files /dev/null and b/source/custos/.DS_Store differ diff --git a/source/custos/index.html b/source/custos/index.html index c87a027..a92c278 100644 --- a/source/custos/index.html +++ b/source/custos/index.html @@ -31,7 +31,7 @@ Partners Contact -https://github.com/apache/airavata-custos/tree/develop; target="_blank"> GitHub +https://github.com/apache/airavata-custos; target="_blank"> GitHub
[airavata-site] branch asf-site updated: Changing custos git link to master
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e15a589 Changing custos git link to master e15a589 is described below commit e15a589e3435fed43de6ffe9e17299204bd1e56e Author: Suresh Marru AuthorDate: Tue Oct 13 23:25:35 2020 -0400 Changing custos git link to master --- content/custos/index.html | 2 +- source/custos/.DS_Store | Bin 0 -> 6148 bytes source/custos/index.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/custos/index.html b/content/custos/index.html index c87a027..a92c278 100644 --- a/content/custos/index.html +++ b/content/custos/index.html @@ -31,7 +31,7 @@ Partners Contact -https://github.com/apache/airavata-custos/tree/develop; target="_blank"> GitHub +https://github.com/apache/airavata-custos; target="_blank"> GitHub diff --git a/source/custos/.DS_Store b/source/custos/.DS_Store new file mode 100644 index 000..9e6f774 Binary files /dev/null and b/source/custos/.DS_Store differ diff --git a/source/custos/index.html b/source/custos/index.html index c87a027..a92c278 100644 --- a/source/custos/index.html +++ b/source/custos/index.html @@ -31,7 +31,7 @@ Partners Contact -https://github.com/apache/airavata-custos/tree/develop; target="_blank"> GitHub +https://github.com/apache/airavata-custos; target="_blank"> GitHub
[airavata-site] branch asf-site updated: changing git url
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/airavata-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 6d1f4bd changing git url 6d1f4bd is described below commit 6d1f4bd153da04492bf50d4b90fb098aeba93009 Author: Suresh Marru AuthorDate: Tue Oct 13 23:27:55 2020 -0400 changing git url --- content/custos/index.html | 2 +- source/custos/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/custos/index.html b/content/custos/index.html index a92c278..5511941 100644 --- a/content/custos/index.html +++ b/content/custos/index.html @@ -53,7 +53,7 @@ alt="Custos Logo" class="ui centered small image"> -https://github.com/apache/airavata-custos/tree/develop; target="_blank" class="ui button black"> GitHub +https://github.com/apache/airavata-custos; target="_blank" class="ui button black"> GitHub diff --git a/source/custos/index.html b/source/custos/index.html index a92c278..5511941 100644 --- a/source/custos/index.html +++ b/source/custos/index.html @@ -53,7 +53,7 @@ alt="Custos Logo" class="ui centered small image"> -https://github.com/apache/airavata-custos/tree/develop; target="_blank" class="ui button black"> GitHub +https://github.com/apache/airavata-custos; target="_blank" class="ui button black"> GitHub
[airavata-custos-portal] branch master updated: Updating README
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-custos-portal.git The following commit(s) were added to refs/heads/master by this push: new 0bf8024 Updating README 0bf8024 is described below commit 0bf802455019468f813c3b52824d293242d5dc70 Author: Suresh Marru AuthorDate: Tue Oct 13 21:19:14 2020 -0400 Updating README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 2f43c32..17f087a 100644 --- a/README +++ b/README @@ -1,3 +1,3 @@ # Apache Airavata Custos Portal -Portal interface implemented in Django Framework to use and administer Custos Services \ No newline at end of file +A Reference Portal interface implemented in Vue.JS Framework to use and administer a sample Custos Tenant
[airavata-custos] branch master updated: custos-python-sdk-demo
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-custos.git The following commit(s) were added to refs/heads/master by this push: new 2d34184 custos-python-sdk-demo 2d34184 is described below commit 2d341849dd8ea8a7c2efec6cc73b01dfd495352e Author: Suresh Marru AuthorDate: Tue Oct 13 21:15:22 2020 -0400 custos-python-sdk-demo --- custos-samples/configs/settings.ini| 8 + custos-samples/samples/__init__.py | 0 custos-samples/samples/group_management_samples.py | 58 .../samples/identity_management_samples.py | 40 +++ .../samples/secret_management_samples.py | 62 .../secure_resources_with_custos_simulation.py | 361 + .../samples/sharing_management_samples.py | 89 + custos-samples/samples/user_management_samples.py | 66 8 files changed, 684 insertions(+) diff --git a/custos-samples/configs/settings.ini b/custos-samples/configs/settings.ini new file mode 100644 index 000..f6289bf --- /dev/null +++ b/custos-samples/configs/settings.ini @@ -0,0 +1,8 @@ +[CustosServer] +SERVER_HOST = custos.scigap.org +SERVER_SSL_PORT = 31499 +;CLIENT_ID = +;CLIENT_SEC = + +CLIENT_ID = +CLIENT_SEC = diff --git a/custos-samples/samples/__init__.py b/custos-samples/samples/__init__.py new file mode 100644 index 000..e69de29 diff --git a/custos-samples/samples/group_management_samples.py b/custos-samples/samples/group_management_samples.py new file mode 100644 index 000..a0082ee --- /dev/null +++ b/custos-samples/samples/group_management_samples.py @@ -0,0 +1,58 @@ +import os + +from custos.clients.group_management_client import GroupManagementClient + +from custos.transport.settings import CustosServerClientSettings +import custos.clients.utils.utilities as utl + +# load root directoty +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + +# get settings file path (settings file path reside in configs folder under home directory) +settings_path = os.path.join(BASE_DIR, 'configs', "settings.ini") + +# read settings +custos_settings = CustosServerClientSettings(configuration_file_location=settings_path) + +# create custos user management client +group_management_client = GroupManagementClient(custos_settings) + +# obtain base 64 encoded token for tenant +b64_encoded_custos_token = utl.get_token(custos_settings=custos_settings) + + +def create_group(name, description, owner_id): +response = group_management_client.create_groups(token=b64_encoded_custos_token, name=name, + description=description, + owner_id=owner_id) +print(response) +return response + + +def add_user_to_group(username, group_id, membership_type): +response = group_management_client.add_user_to_group(token=b64_encoded_custos_token, + username=username, + group_id=group_id, + membership_type=membership_type) +print(response) + + +def add_child_group_to_parent_group(parent_group_id, child_group_id): +response = group_management_client.add_child_group(token=b64_encoded_custos_token, parent_group_id=parent_group_id, + child_group_id=child_group_id) +print(response) + + +def remove_child_group(parent_group_id, child_group_id): +response = group_management_client.add_child_group(token=b64_encoded_custos_token, parent_group_id=parent_group_id, + child_group_id=child_group_id) +print(response) + + +create_group("Group A", "Paren group", "TestUser4") +create_group("Group B", "Child group", "TestUser4") + +add_user_to_group("Testuser5", "602336d5-e193-41ac-bde6-eb36a73f687e", "Member") + +add_child_group_to_parent_group("8b0f8241-e995-496e-a4f5-bdbde4235215", "602336d5-e193-41ac-bde6-eb36a73f687e") +remove_child_group("8b0f8241-e995-496e-a4f5-bdbde4235215", "602336d5-e193-41ac-bde6-eb36a73f687e") diff --git a/custos-samples/samples/identity_management_samples.py b/custos-samples/samples/identity_management_samples.py new file mode 100644 index 000..d135f57 --- /dev/null +++ b/custos-samples/samples/identity_management_samples.py @@ -0,0 +1,40 @@ +import os + +from custos.clients.identity_management_client import IdentityManagementClient + +from custos.transport.settings import CustosServerClientSettings +import custos.clients.utils.utilities as utl + +# load APIServerClient with default configuration +BASE_DIR = os.pa
[airavata-custos] 01/01: Merge branch 'master' into develop
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-custos.git commit a16239330dea63f448b36f4369f3eac260039ac9 Merge: 9845ab1 e03271f Author: Suresh Marru AuthorDate: Tue Oct 13 21:07:31 2020 -0400 Merge branch 'master' into develop
[airavata-custos] branch master updated: removing redundant flag
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-custos.git The following commit(s) were added to refs/heads/master by this push: new e03271f removing redundant flag e03271f is described below commit e03271f3c40c120bb547591b6c57894f21717fd6 Author: Suresh Marru AuthorDate: Tue Oct 13 20:42:02 2020 -0400 removing redundant flag --- .asf.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index ad4680c..0fe606c 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -40,6 +40,4 @@ github: features: wiki: false issues: true - -projects: true projects: true
[airavata-custos] 01/01: Merge pull request #115 from apache/custos-python-sdk-demo
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-custos.git commit 4c89a610735582015a24ba9911b08f5e3f135643 Merge: cb5f076 f91dbdf Author: Suresh Marru AuthorDate: Tue Oct 13 20:32:09 2020 -0400 Merge pull request #115 from apache/custos-python-sdk-demo Merging Custos python sdk demo into Master .asf.yaml | 20 ++ .gitignore | 42 +++ .travis.yml| 2 +- LICENSE| 201 README | 5 - custos-samples/configs/settings.ini| 8 + custos-samples/samples/__init__.py | 0 custos-samples/samples/group_management_samples.py | 58 .../samples/identity_management_samples.py | 40 +++ .../samples/secret_management_samples.py | 62 .../secure_resources_with_custos_simulation.py | 361 + .../samples/sharing_management_samples.py | 89 + custos-samples/samples/user_management_samples.py | 66 pom.xml| 111 --- 14 files changed, 747 insertions(+), 318 deletions(-)
[airavata-custos] branch master updated (cb5f076 -> 4c89a61)
This is an automated email from the ASF dual-hosted git repository. smarru pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-custos.git. from cb5f076 removing legacy credential store and python clients add 6aea83b added profile service, security service, custos common utilities and thrift files add 7d1e712 1. modified the project structure 2. corrected the thrift files 3. modified the UserProfileHandler, IamAdminServerHandler and TenantProfileHandler add 1f86fea corrected the sql files add 6c3fb74 added logging add 8f67c2d added logging add 55853a8 Merge branch 'custos-dev-abisht' of https://github.com/aarushiibisht/airavata-custos into custos-dev-abisht add 6563e2c added authentication service add 0a9efcb added gitignore file add d71d201 added custos authentication server add a01e225 corrected the authentication client add 37a1821 configuration changes add 1f8697e Merge pull request #1 from aarushiibisht/custos-dev-abisht add 21e80c7 added custos tenant profile add 611cb4a Merge pull request #2 from aarushiibisht/custos-dev-abisht add 07dbb75 removed hard coded version from the pom.xml files which now uses project version add 6fa92d1 code refactoring add 44b6bb1 Merge pull request #3 from aarushiibisht/custos-dev-abisht add bd6952c code refactoring add b5260d9 Merge branch 'custos-dev-abisht' of https://github.com/aarushiibisht/airavata-custos into custos-dev-abisht add cf853a8 Merge branch 'custos-dev-abisht' of https://github.com/aarushiibisht/airavata-custos into custos-dev-abisht add ca8a8bb Merge branch 'custos-dev-abisht' of https://github.com/aarushiibisht/airavata-custos into custos-dev-abisht add c9ca887 Merge pull request #4 from aarushiibisht/custos-dev-abisht add d268641 refactored tenant profile and iam admin services service add 20e5010 addes user profile test cases add 7ba18f6 Added user profile service unit test cases add e01fd7c Merge pull request #2 from aarushiibisht/master add a08c0b1 added samples for end to end testing and junit test cases add 5595257 added readme, log4j properties files, samples for end to end testing of services and deleted unnecessary configuration files add 469150f Merge pull request #4 from aarushiibisht/custos-dev-abisht add daf1e71 migrated sharing registry service into custos add d89e0de created apis from group service and sharing service add a0b6462 Merge pull request #6 from aarushiibisht/custos-dev-abisht add 757fe55 updated the branch with master add b211e6d Merge pull request #7 from aarushiibisht/custos_sharing_registry_changes add 3c65949 refactored some apis, added database dump add 7534acb updated the sharing registry apis add 0a94161 Merge pull request #8 from aarushiibisht/custos_sharing_registry_changes add e59c4d8 added a readme add da05787 Merge pull request #9 from aarushiibisht/custos_sharing_registry_changes add fc08910 code refactoring add 5fe0bee Merge pull request #10 from aarushiibisht/custos_sharing_registry_changes add 1b588e9 group profile service changes should go in a different commit add 409ac82 group profile service changes should go in a different commit add 2e3135a Merge pull request #5 from aarushiibisht/master add 7fee0b2 added validations and refactored exception handling add 240a19b Added validations and refactored exception handling for sharing service add a57cdd6 Merge pull request #6 from aarushiibisht/master add c01df51 added ansible playbooks add 76e8320 Merge pull request #9 from aarushiibisht/custos-dev-abisht add 5c69270 Updated ansible scripts add 9b13ad6 Added keystore add aee42eb Rest API initial commit add 774ad91 Adding additional methods to TenantController add 269a523 Draft API definitions for Resource, Secret and CILogon controllers add 0c90bb7 custos project prototype add 699b768 Adding docker image build and helm chart support add 8c57d05 Add asynchronuse messageflow support add b5911cd Integrating slueth zipking and grpc tracing add 5a879da Add prometheus support add 8d8179e Adding side car support add 4419ad1 Add nginx controller add f1910ff ingress-grpc add a2fa607 Tenant profile persistance data model add 4c06534 Complete Tenant Profile Service Functions add d41601c COmplete tenant core add b922f59 Add IAM services add da2e1b9 Complete IAM Service add 7d1fffc Add credential store service add e82f097 Add credential core stubs add fb839f7 Add CILogon client add dc66523 Add federated authentication core service add acd97a1 Add federated authentication core service add 81407f9 federated client stub add