Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First release #6

Merged
merged 119 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
24b3625
Init las2peer service
phil-cd Feb 28, 2021
fb75148
Init project-list frontend element
phil-cd Feb 28, 2021
674c1b2
Test codecov
phil-cd Feb 28, 2021
4c8f7ec
Added badges for Java CI and codecov
phil-cd Feb 28, 2021
11ba650
Added basic structure of project list and updated demo
phil-cd Mar 1, 2021
d71106f
Added dropdown to select groups
Aran30 Mar 2, 2021
56eff44
Added statusbar + loginhandler
Aran30 Mar 2, 2021
251ec18
Removal of redundant files
Aran30 Mar 2, 2021
2b58810
Removal of redundant files and code parts
phil-cd Mar 2, 2021
077d02e
Added slot for every project item in the list
phil-cd Mar 2, 2021
7d3a497
Groups are fetched when creating project
Aran30 Mar 2, 2021
c6508bf
Can create projects which will contain members from selected groups
Aran30 Mar 2, 2021
b0ac97d
Starting implementing storage of projects into pastry, not functional…
Aran30 Mar 3, 2021
860951e
Added UI for changing connected group
phil-cd Mar 4, 2021
3907e4e
Further implemented storing of projects in pastry
Aran30 Mar 4, 2021
aa96ea8
Finished a first working version of storing projects in evelopes and …
Aran30 Mar 5, 2021
8bbe874
Code cleanup
phil-cd Mar 5, 2021
c58694a
Started checking group membership when fetching projects
phil-cd Mar 5, 2021
6c56bd9
Storing full project in ProjectContainer in envelope
phil-cd Mar 5, 2021
932a01e
Removed redundant throws statement
phil-cd Mar 5, 2021
88d2c3b
Added configurationfile with visibilityOfProjects parameter
Aran30 Mar 6, 2021
b477caa
Updated README & added Dockerfile
phil-cd Mar 7, 2021
07761a9
Fixed project reloading after creating a new project and fixed click …
phil-cd Mar 7, 2021
ed50b91
Correctly display "All Projects" and "My Projects"
phil-cd Mar 7, 2021
4828a1e
Fixed build and removed some not needed classes
phil-cd Mar 8, 2021
c3cd4ec
Changing group in frontend + backend possible
Aran30 Mar 12, 2021
1653223
Group change gets shown in demo information
Aran30 Mar 12, 2021
1caed89
Commit to pass build
Aran30 Mar 12, 2021
04c7f6d
Add hasAccessToProject method for RMI and using group agent for stori…
phil-cd Mar 13, 2021
db9b323
Added more tests
phil-cd Mar 13, 2021
9adc997
Code cleanup
phil-cd Mar 14, 2021
2c2bcb2
Forbid changing group if no project member and started adding project…
phil-cd Mar 14, 2021
fe10e9b
Added first event (project creation) where a configurable service is …
phil-cd Mar 14, 2021
7497fda
Fixed problem with EventManager
phil-cd Mar 15, 2021
52eb7fc
Testing service group agent for storing envelopes
phil-cd Mar 15, 2021
2cf9cc3
Update .gitignore
Aran30 Mar 15, 2021
18cdf60
Added global event to trigger metadata change function in project widget
Aran30 Mar 15, 2021
9af04f4
Updated README and added helper for online user list
phil-cd Mar 16, 2021
3344cd6
SyncMeta online user list is working
phil-cd Mar 16, 2021
0d858ac
Missing update of packages
phil-cd Mar 16, 2021
8d1282d
Finished change metamodel function
Aran30 Mar 16, 2021
8bc8808
Added possible solution to serviceagent problem
Aran30 Mar 19, 2021
1a5c559
Merge remote-tracking branch 'origin/service-group-agent' into develop
phil-cd Mar 19, 2021
c7dda73
Adapted ServiceTest to using a service group
phil-cd Mar 19, 2021
0a1af6b
Backend for deleting projects
phil-cd Mar 20, 2021
a4b0fbf
Frontend for deleting projects
phil-cd Mar 20, 2021
1d9ea70
Updated README (added project deletion event and serviceGroupId prope…
phil-cd Mar 20, 2021
fff239e
Added JUnit tests for change metadata method
phil-cd Mar 20, 2021
ba0ca70
Create workflow to publish to npmjs on release
phil-cd Mar 21, 2021
4bc6133
Correct package name (with org scope)
phil-cd Mar 21, 2021
51cce53
Cleanup and added more tests
phil-cd Mar 21, 2021
2dbdb30
Backend should work with multiple systems now
phil-cd Mar 22, 2021
a390d67
Frontend uses "system" attribute for project service calls
phil-cd Mar 22, 2021
69c44e1
Started updating docker entrypoint (regarding service group)
phil-cd Mar 23, 2021
4ce4be0
Fixed wrong binding problem
Aran30 Mar 23, 2021
d98e44c
Docker container is now able to handle service group
phil-cd Mar 23, 2021
57fd3d4
Merge branch 'update-docker' into develop
phil-cd Mar 23, 2021
68d022a
Fixed missing systems property when using docker
phil-cd Mar 24, 2021
76946a9
Wrapper for /changeMetadata used for RMI
phil-cd Mar 27, 2021
8b33ff7
Method to fetch single project
phil-cd Mar 27, 2021
ffee6d5
Added RMI methods for fetching and changing metadata
phil-cd Mar 29, 2021
3a5091c
Removed Yjs imports in OnlineUserListHelper leading to problems
phil-cd Mar 30, 2021
c7ad29f
Tests for multiple systems and getProjectByName
phil-cd Mar 30, 2021
c8a0953
Missing change in last commit (updated .properties file)
phil-cd Mar 30, 2021
2f4a015
Only show project edit button if user is a member
phil-cd Apr 4, 2021
21cd13a
projects-loaded event now contains all projects (not only the ones fr…
phil-cd Apr 4, 2021
4357f6e
Updated RMI methods list
phil-cd Apr 9, 2021
02d7f86
Small improvements & more tests
phil-cd Apr 9, 2021
19af275
Use project yjs room to share metadata
phil-cd Apr 11, 2021
c493f2a
Updated package-lock.json
phil-cd Jul 5, 2021
dbe5d13
Add npmjs badge
phil-cd Jul 5, 2021
34eb3c3
Test using Yjs secured rooms
phil-cd Jul 18, 2021
aac1e89
Add metadata-reload-request to frontend
phil-cd Jul 18, 2021
b6e0d39
Extended demo to showcase metadata sharing via Yjs
phil-cd Jul 19, 2021
41b0878
Remove y.close() in online user list helper
phil-cd Jul 31, 2021
016c341
Update version of frontend widget to 0.0.3
phil-cd Aug 1, 2021
831fc38
Use copy of project and metadata when sharing it
phil-cd Aug 1, 2021
458920f
Correct frontend version in package.json
phil-cd Aug 8, 2021
a8b875f
Use latest y-websockets-client (v8)
phil-cd Aug 8, 2021
a0cad06
Disconnect from previous project room when selecting another one
phil-cd Aug 8, 2021
d249183
Updated READMEs
phil-cd Aug 8, 2021
fe64261
Add GitHub repository to package.json
phil-cd Aug 8, 2021
ec135d8
Update READMEs
phil-cd Aug 8, 2021
e1c32f1
Update README
phil-cd Aug 8, 2021
e4fe7c4
Update version of project-list element
phil-cd Aug 8, 2021
80c773e
Remove unused file
phil-cd Aug 8, 2021
b15bc90
Demo uses correct y-websockets-client dist file
phil-cd Aug 13, 2021
0d7bf8d
Only fetch projects if user is logged in
phil-cd Aug 13, 2021
29b3529
Update version of frontend
phil-cd Aug 15, 2021
948976b
Event listener for reloading the projects
phil-cd Aug 15, 2021
44cba11
Merge pull request #2 from rwth-acis/metadata-yjs
phil-cd Aug 15, 2021
71a0f5c
Workflow for docker CI
phil-cd Aug 15, 2021
4887fd1
Add missing script for generating group agent
phil-cd Aug 15, 2021
49b0183
Push docker image to ghcr.io too
phil-cd Aug 15, 2021
292ca71
Fix #1
phil-cd Aug 15, 2021
ed9b8b3
Updated README
phil-cd Aug 16, 2021
6c0f389
Refactoring: Move systems config into separate class(es)
phil-cd Sep 7, 2021
1834e90
Missing javadoc
phil-cd Sep 7, 2021
a7bb3cb
GitHub projects connection can be enabled/disabled in systems config #4
phil-cd Sep 7, 2021
128d564
GitHub organization configuration for systems & added GitHubHelper #4
phil-cd Sep 7, 2021
11be3ea
Creation of GitHub project when creating a new las2peer project
phil-cd Sep 10, 2021
1c85cbc
Moved GitHub project creation
phil-cd Sep 10, 2021
4b03f69
Delete GitHub project when las2peer project gets deleted #4
phil-cd Sep 10, 2021
b98ddfb
Frontend: Icon with link to connected GitHub project #4
phil-cd Sep 10, 2021
08de4fc
Service: Grant users access to GitHub projects #4
phil-cd Sep 14, 2021
cd381a9
Frontend informs service about GitHub username #4
phil-cd Sep 14, 2021
2f9e72f
Remove access to GitHub project if user left group #4
phil-cd Sep 14, 2021
641d8a0
Updated README #4
phil-cd Sep 14, 2021
cbd5d2f
Merge pull request #5 from rwth-acis/github-projects
phil-cd Sep 20, 2021
cc2cd1e
Update version of frontend to 0.3.0
phil-cd Sep 20, 2021
e1f30da
Update version of frontend to 0.3.1 (fix loading error)
phil-cd Sep 20, 2021
46c4bdd
Reposition GitHub icon in project list
phil-cd Sep 25, 2021
d7af90e
Updated README (hint to start userinfo service)
phil-cd Sep 29, 2021
6969d13
Gradle 7.2
phil-cd Oct 24, 2021
5e4cb76
Try l2p 1.2-SNAPSHOT with Java 17
phil-cd Oct 24, 2021
83d6b72
Use Java 17 in workflow
phil-cd Oct 24, 2021
9e80d54
Try --add-opens in java service start command
phil-cd Oct 30, 2021
38ea3bc
Update to las2peer v1.2
phil-cd Dec 15, 2021
d574365
Updated README
phil-cd Dec 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/docker-CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Docker Build and Push

on:
push:
branches: [ main, develop ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: extract_branch
- name: Build the Docker image
run: |
docker build -t registry.tech4comp.dbis.rwth-aachen.de/rwthacis/las2peer-project-service:${{ steps.extract_branch.outputs.branch }} .
- name: Push to registry
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PW: ${{ secrets.DOCKER_PW }}
run: |
docker login -u $DOCKER_USERNAME -p $DOCKER_PW registry.tech4comp.dbis.rwth-aachen.de
docker push registry.tech4comp.dbis.rwth-aachen.de/rwthacis/las2peer-project-service:${{ steps.extract_branch.outputs.branch }}
40 changes: 40 additions & 0 deletions .github/workflows/docker-ghcr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Build and publish docker image to ghcr.io

on:
push:
branches: ["main", "develop"]

env:
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ghcr.io/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
26 changes: 26 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Java CI with Gradle

# Triggers the workflow on push or pull request events (on every branch)
on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
- uses: codecov/codecov-action@v1
with:
files: ./project_service/export/jacoco/test/jacocoTestReport.xml
20 changes: 20 additions & 0 deletions .github/workflows/npmjs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: npmjs publish package
on:
release:
types: [created]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2
with:
node-version: '12.x'
registry-url: 'https://registry.npmjs.org'
- run: npm install
working-directory: frontend
- run: npm publish --access public
working-directory: frontend
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/project_service/output/
/project_service/export/
/node-storage/
/node_modules
/.las2peer/
/tmp/
/log/
/project_service/log/
/lib/
/service/
/out/
/.idea/
*.iml
.DS_Store
/.settings/
/junitvmwatcher*.properties
/junit*.properties
/etc/startup/
*.secret
.classpath
.project
.settings

# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
node_modules
22 changes: 22 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM openjdk:17-jdk-alpine

ENV HTTP_PORT=8080
ENV HTTPS_PORT=8443
ENV LAS2PEER_PORT=9011

RUN apk add --update bash && rm -f /var/cache/apk/*
RUN addgroup -g 1000 -S las2peer && \
adduser -u 1000 -S las2peer -G las2peer

COPY --chown=las2peer:las2peer . /src
WORKDIR /src

RUN chmod +x /src/docker-entrypoint.sh
# run the rest as unprivileged user
USER las2peer
RUN chmod +x gradlew && ./gradlew build --exclude-task test javadoc

EXPOSE $HTTP_PORT
EXPOSE $HTTPS_PORT
EXPOSE $LAS2PEER_PORT
ENTRYPOINT ["/src/docker-entrypoint.sh"]
116 changes: 116 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
CC0 1.0 Universal

Statement of Purpose

The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator and
subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").

Certain owners wish to permanently relinquish those rights to a Work for the
purpose of contributing to a commons of creative, cultural and scientific
works ("Commons") that the public can reliably and without fear of later
claims of infringement build upon, modify, incorporate in other works, reuse
and redistribute as freely as possible in any form whatsoever and for any
purposes, including without limitation commercial purposes. These owners may
contribute to the Commons to promote the ideal of a free culture and the
further production of creative, cultural and scientific works, or to gain
reputation or greater distribution for their Work in part through the use and
efforts of others.

For these and/or other purposes and motivations, and without any expectation
of additional consideration or compensation, the person associating CC0 with a
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
and publicly distribute the Work under its terms, with knowledge of his or her
Copyright and Related Rights in the Work and the meaning and intended legal
effect of CC0 on those rights.

1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not limited
to, the following:

i. the right to reproduce, adapt, distribute, perform, display, communicate,
and translate a Work;

ii. moral rights retained by the original author(s) and/or performer(s);

iii. publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;

iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;

v. rights protecting the extraction, dissemination, use and reuse of data in
a Work;

vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation thereof,
including any amended or successor version of such directive); and

vii. other similar, equivalent or corresponding rights throughout the world
based on applicable law or treaty, and any national implementations thereof.

2. Waiver. To the greatest extent permitted by, but not in contravention of,
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
and Related Rights and associated claims and causes of action, whether now
known or unknown (including existing as well as future claims and causes of
action), in the Work (i) in all territories worldwide, (ii) for the maximum
duration provided by applicable law or treaty (including future time
extensions), (iii) in any current or future medium and for any number of
copies, and (iv) for any purpose whatsoever, including without limitation
commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
the Waiver for the benefit of each member of the public at large and to the
detriment of Affirmer's heirs and successors, fully intending that such Waiver
shall not be subject to revocation, rescission, cancellation, termination, or
any other legal or equitable action to disrupt the quiet enjoyment of the Work
by the public as contemplated by Affirmer's express Statement of Purpose.

3. Public License Fallback. Should any part of the Waiver for any reason be
judged legally invalid or ineffective under applicable law, then the Waiver
shall be preserved to the maximum extent permitted taking into account
Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
is so judged Affirmer hereby grants to each affected person a royalty-free,
non transferable, non sublicensable, non exclusive, irrevocable and
unconditional license to exercise Affirmer's Copyright and Related Rights in
the Work (i) in all territories worldwide, (ii) for the maximum duration
provided by applicable law or treaty (including future time extensions), (iii)
in any current or future medium and for any number of copies, and (iv) for any
purpose whatsoever, including without limitation commercial, advertising or
promotional purposes (the "License"). The License shall be deemed effective as
of the date CC0 was applied by Affirmer to the Work. Should any part of the
License for any reason be judged legally invalid or ineffective under
applicable law, such partial invalidity or ineffectiveness shall not
invalidate the remainder of the License, and in such case Affirmer hereby
affirms that he or she will not (i) exercise any of his or her remaining
Copyright and Related Rights in the Work or (ii) assert any associated claims
and causes of action with respect to the Work, in either case contrary to
Affirmer's express Statement of Purpose.

4. Limitations and Disclaimers.

a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.

b. Affirmer offers the Work as-is and makes no representations or warranties
of any kind concerning the Work, express, implied, statutory or otherwise,
including without limitation warranties of title, merchantability, fitness
for a particular purpose, non infringement, or the absence of latent or
other defects, accuracy, or the present or absence of errors, whether or not
discoverable, all to the greatest extent permissible under applicable law.

c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without limitation
any person's Copyright and Related Rights in the Work. Further, Affirmer
disclaims responsibility for obtaining any necessary consents, permissions
or other rights required for any use of the Work.

d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to this
CC0 or use of the Work.

For more information, please see
<http://creativecommons.org/publicdomain/zero/1.0/>
Loading