Merge pull request #135 from softvis-research/development

v1.3.0

Author: naraesk

.gitignore

@@ -1,4 +1,8 @@
 *.komodoproject
 */.idea
+*.iml
+ui/data/
 
-\.idea/
+generator2/org.getaviz.generator/.idea/
+
+.idea/

.travis.yml

@@ -3,13 +3,13 @@ matrix:
     - name: Docker
       script:
         - docker-compose -f docker-compose.test.yml run tests
-    - name: Generator
-      language: java
-      before_install:
-        - cd generator
-        - cd org.svis.generator.releng/
-      script:
-        - mvn clean install -fae
+    #- name: Generator
+      #language: java
+      #before_install:
+        #- cd generator
+        #- cd org.svis.generator.releng/
+      #script:
+        #- mvn clean install -fae
     #- name: Generator2
       #language: java
       #before_install:

LICENSE

@@ -199,3 +199,11 @@
    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.
+   
+   APPENDIX: Third Party Dependencies
+   
+      This proudct includes X3DOM Geometry2D 1.7.0, which is available under
+      a MIT license. For details, see ui/libs/x3dom.
+      
+      This product includes d3.ForceBundle, which is available under GPL-2.0.
+      For details, see ui/d3.

README.md

@@ -19,12 +19,12 @@ Getaviz is mainly developed by the research group [Visual Software Analytics](ht
 * [Pascal Kovacs](https://github.com/PascalKovacs)
 * [David Baum](http://home.uni-leipzig.de/svis/Research%20Group/#DavidBaum)
 
-Many thanks to all the contributors who have improved Getaviz by implementing new features or fixing bugs, especially: Denise Zilch, [André Naumann](https://github.com/sk2andy), [Stefan Faulhaber](https://github.com/StefanFaulhaber), [Dan Häberlein](https://github.com/dhaeb),  [Lisa Vogelsberg](https://github.com/Valekta/), [Aaron Sillus](https://github.com/AaronSil), [Jens Thomann](https://github.com/jt23coqi), and [Vladislavs Terjaniks](https://github.com/VlaD-T).
- 
+Many thanks to all the contributors who have improved Getaviz by implementing new features or fixing bugs, especially: Denise Zilch, [André Naumann](https://github.com/sk2andy), [Stefan Faulhaber](https://github.com/StefanFaulhaber), [Dan Häberlein](https://github.com/dhaeb),  [Lisa Vogelsberg](https://github.com/Valekta/), [Aaron Sillus](https://github.com/AaronSil), [Jens Thomann](https://github.com/jt23coqi), [Xuefei Gao](https://github.com/SophiaLangheld), [Vladislavs Terjaniks](https://github.com/VlaD-T), [Łukasz Kalfas](https://github.com/Lukasz-kal), and [Christina Sixtus](https://github.com/ChristinaSi).
+
 ## Publications
 * David Baum, Pascal Kovacs, Richard Müller: [Fostering Collaboration of Academia and Industry by Open Source Software](https://www.researchgate.net/publication/338008152_Fostering_Collaboration_of_Academia_and_Industry_by_Open_Source_Software), SE20 Software Engineering, 2020.
 * David Baum, Christina Sixtus, Lisa Vogelsberg, Ulrich Eisenecker: [Understanding Conditional Compilation Through Integrated Representation of Variability and Source Code](https://arxiv.org/pdf/1908.08375), SPLC, 2019.
 * David Baum, Jens Dietrich, Craig Anslow, Richard Müller: [Visualizing Design Erosion: How Big Balls of Mud are Made](https://arxiv.org/abs/1807.06136), IEEE VISSOFT, 2018.
-* David Baum. Jan Schilbach, Pascal Kovacs, Ulrich Eisenecker, Richard Müller: [GETAVIZ: Generating Structural, Behavioral, and Evolutionary Views of Software Systems for Empirical Evaluation](https://www.researchgate.net/publication/320083290_GETAVIZ_Generating_Structural_Behavioral_and_Evolutionary_Views_of_Software_Systems_for_Empirical_Evaluation), IEEE VISSOFT, 2017.
+* David Baum, Jan Schilbach, Pascal Kovacs, Ulrich Eisenecker, Richard Müller: [GETAVIZ: Generating Structural, Behavioral, and Evolutionary Views of Software Systems for Empirical Evaluation](https://www.researchgate.net/publication/320083290_GETAVIZ_Generating_Structural_Behavioral_and_Evolutionary_Views_of_Software_Systems_for_Empirical_Evaluation), IEEE VISSOFT, 2017.
 
 A full list of publications you can find on [our website](http://home.uni-leipzig.de/svis/Publications/).

docker-compose.test.yml

@@ -30,6 +30,9 @@ services:
     neo4j:
         image: neo4j:3.5.1
         restart: always
+        ports:
+            - "7474:7474"
+            - "7687:7687"
         environment:
             NEO4J_AUTH: "none"
         networks:

docker-compose.yml

@@ -1,71 +1,68 @@
-version: "3"
+version: '3'
 services:
-    db:
-        image: mysql:5.7
-        environment:
-            MYSQL_ROOT_PASSWORD: dbpassword_for_user
-            MYSQL_DATABASE: eval_server_development
-            MYSQL_USER: db_username
-            MYSQL_PASSWORD: dbpassword_for_user
-        restart: always
-    eval:
-        build: evaluationserver
-        restart: always
-        env_file: evaluationserver/env
-        command: "./bin/wait-for-it.sh db:3306 -s -t 30 -- ./bin/docker_start"
-        #volumes:
-        #- ./evaluationserver:/usr/src/app
-        ports:
-            - "8081:8081" 
-        depends_on:
-            - db
-    frontend:
-        build: ui/
-        restart: always
-        volumes:
-            #- ./ui:/var/www/html/ui # uncomment only for ui development
-            - data-gen:/var/www/html/ui/data-gen
-        ports:
-            - "8082:80"
-        networks:
-            - default
-        depends_on:
-            - backend
-    backend:
-        build: generator2/org.getaviz.generator/
-        restart: always
-        volumes: 
-            - data-gen:/var/lib/jetty/data-gen
-            #- ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war # uncomment only for generator development
-            #- ./generator2/org.getaviz.generator/settings.properties:/opt/config/settings.properties # uncomment only for generator development
-            #- ./generator2/output:/var/lib/jetty/output/ # uncomment only for generator development
-            #- ./generator2/logs:/var/lib/jetty/logs # uncomment only for generator development
-        ports:
-            - "8083:8080"
-        networks:
-            - default
-        depends_on:
-            - neo4j
-            - volumes-provisioner
-    neo4j:
-        image: neo4j:3.5.1
-        restart: always
-        ports:
-            - "7474:7474"
-            - "7687:7687"
-        environment:
-            NEO4J_AUTH: "none"
-        networks:
-            - default
-    volumes-provisioner:
-        image: hasnat/volumes-provisioner
-        environment:
-            PROVISION_DIRECTORIES: "100:101:0755:/var/data /var/data/data-gen/"
-        volumes:
-            - data-gen:/var/data
+  db:
+    image: mysql:5.7
+    environment:
+      MYSQL_ROOT_PASSWORD: dbpassword_for_user
+      MYSQL_DATABASE: eval_server_development
+      MYSQL_USER: db_username
+      MYSQL_PASSWORD: dbpassword_for_user
+    restart: always
+  eval:
+    build: evaluationserver
+    restart: always
+    env_file: evaluationserver/env
+    command: "./bin/wait-for-it.sh db:3306 -s -t 30 -- ./bin/docker_start"
+    #volumes:
+      #- ./evaluationserver:/usr/src/app
+    ports:
+      - "8081:8081" 
+    depends_on:
+      - db
+  frontend:
+    build: ui/
+    restart: always
+    volumes:
+      #- ./ui:/var/www/html/ui # uncomment only for ui development
+      - data-gen:/var/www/html/ui/data-gen
+    ports:
+      - "8082:80"
+    networks:
+      - default
+    depends_on:
+      - backend
+  backend:
+    build: generator2/org.getaviz.generator/
+    restart: always
+    volumes: 
+      - data-gen:/var/lib/jetty/data-gen
+     #- ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war # uncomment only for generator development
+    ports:
+      - "8083:8080"
+    networks:
+      - default
+    depends_on:
+      - neo4j
+      - volumes-provisioner
+  neo4j:
+    image: neo4j:3.5.1
+    restart: always
+    ports:
+      - "7474:7474"
+      - "7687:7687"
+    environment:
+      NEO4J_AUTH: "none"
+    networks:
+      - default
+  volumes-provisioner:
+    image: hasnat/volumes-provisioner
+    environment:
+      PROVISION_DIRECTORIES: "100:101:0755:/var/data /var/data/data-gen/"
+    volumes:
+      - data-gen:/var/data
 volumes:
   data-gen:
 
 networks:
-    default:
-        driver: bridge
+  default:
+    driver: bridge

evaluationserver/.dockerignore

@@ -1,3 +1,4 @@
 .git
 .env
-.dockerignore
+.dockerignore
+*.sql

evaluationserver/.gitignore

@@ -22,12 +22,7 @@ public/system/tests/
 source.sh
 .env
 
-db-deployment.yaml
-db-service.yaml
-web-claim0-persistentvolumeclaim.yaml
-web-deployment.yaml
-web-env-configmap.yaml
-web-service.yaml
+
 coverage
 
 # Ignore encrypted secrets key file.

evaluationserver/Dockerfile

@@ -1,7 +1,9 @@
-FROM getaviz/evaluationserver-base:1.2.1
+FROM getaviz/evaluationserver-base:1.3.2
 WORkDIR /usr/src/app/
-COPY . .
+COPY Gemfile .
+COPY Gemfile.lock .
 RUN bundle install --jobs 20 --retry 5 && gem install bundler
+COPY . .
 LABEL maintainer="[email protected]" \
       version="1.0"
 EXPOSE 8081

evaluationserver/Gemfile

@@ -70,6 +70,7 @@ group :development, :test do
   gem 'capybara-screenshot', :group => :test
 end
 
+
 gem "font-awesome-rails"
 gem "therubyracer"
 gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
@@ -89,3 +90,8 @@ gem 'rails_serve_static_assets'
 gem "cocoon"
 gem 'multi-select-rails'
 gem "puma"
+
+
+group :development do
+  gem 'seed_dump'
+end