Merge pull request #51 from softvis-research/development

v1.1.1

Author: naraesk

.gitignore

@@ -1,2 +1,4 @@
 *.komodoproject
 */.idea
+
+\.idea/

.travis.yml

@@ -1,18 +1,35 @@
-before_script:
-- cp evaluationserver/config/database.travis.yml evaluationserver/config/database.yml
-- mysql -e 'create database eval_server_test;'
-- cd evaluationserver/
-- bundle install
-env:
-  secure: Nyq2gajx/TWjeIZtGZSkHREgpE0BhuQg6VOscDKKrenN/CPZ/8wT/h3DYrXOTq+Pz4yOGBgDbptXdT4szu88H5lCNcCfzTnyp/Y+NE/t12nheNFrzlm2L4ryF5IvpAHEXJLYkoJRHXvD4FWTsp/SI3RPLMu9ah2J7gheGSHomZKoApYTLp1NjVSRAgrWGjodMHIYC7d40pNoMyMa/i3EDUHLQ3kNc1U3GGmzaj3Et1Ak6UMQeRE5ph9bfYOZy83Cit9DedeEdbdrnvLa23z/UVp/dmpEchd/844MOKoeX8HPpYW1x/1CovYn3/dshf/bhAkMvngTtJCgyrEpWgy9bb5bwnvjOz2FxBFB8eb/7hfK//6fynCCe5XmPahnIddp7kSNmHwaT4zwUSlFIFegaeZyr6uC5JYFue9i1rICSbAKqOc4EmrL9nKY9Mh6CvW232qiSTvNN02CiSZsAKdA61ou3H7X9UK7WeEAIC43WHkuM5Rn9leB6QC5nwp0UUqY6jbGknoDtvq87t2tVIiAy5aPmpKnrf0C4uUmaz6zZWz4vvjHok6Kuh6ut2LucwVvisCJ7wTRSXB43ubCsuOMSDkd7u4JJUPJPlzc57rQoXSBm68bnuy7SQ2l/epQbl/O9lrxkQLA52JxNF8zdMT7ZKfoGQkQZjXF1YNhp4VHmfA=
-language: ruby
-rvm:
-- 2.5.0
-script:
-- bundle exec rails db:migrate RAILS_ENV=test
-- bundle exec rspec
-after_failure:
-- mysql -e 'show databases;'
-- cat ./config/database.yml
-- echo $RAILS_ENV
-- bundle exec rake --version
+matrix:
+  include:
+    - name: Generator
+      language: java
+      before_install:
+        - cd generator
+        - cd org.svis.generator.releng/
+      script:
+        - mvn clean install -fae
+    - name: Generator2
+      language: java
+      before_install:
+        - cd generator2
+        - cd org.getaviz.generator/
+      script:
+        - mvn clean install
+    - name: Evaluation Server
+      language: ruby
+      before_script:
+        - cp evaluationserver/config/database.travis.yml evaluationserver/config/database.yml
+        - mysql -e 'create database eval_server_test;'
+        - cd evaluationserver/
+        - bundle install
+      env:
+        secure: Nyq2gajx/TWjeIZtGZSkHREgpE0BhuQg6VOscDKKrenN/CPZ/8wT/h3DYrXOTq+Pz4yOGBgDbptXdT4szu88H5lCNcCfzTnyp/Y+NE/t12nheNFrzlm2L4ryF5IvpAHEXJLYkoJRHXvD4FWTsp/SI3RPLMu9ah2J7gheGSHomZKoApYTLp1NjVSRAgrWGjodMHIYC7d40pNoMyMa/i3EDUHLQ3kNc1U3GGmzaj3Et1Ak6UMQeRE5ph9bfYOZy83Cit9DedeEdbdrnvLa23z/UVp/dmpEchd/844MOKoeX8HPpYW1x/1CovYn3/dshf/bhAkMvngTtJCgyrEpWgy9bb5bwnvjOz2FxBFB8eb/7hfK//6fynCCe5XmPahnIddp7kSNmHwaT4zwUSlFIFegaeZyr6uC5JYFue9i1rICSbAKqOc4EmrL9nKY9Mh6CvW232qiSTvNN02CiSZsAKdA61ou3H7X9UK7WeEAIC43WHkuM5Rn9leB6QC5nwp0UUqY6jbGknoDtvq87t2tVIiAy5aPmpKnrf0C4uUmaz6zZWz4vvjHok6Kuh6ut2LucwVvisCJ7wTRSXB43ubCsuOMSDkd7u4JJUPJPlzc57rQoXSBm68bnuy7SQ2l/epQbl/O9lrxkQLA52JxNF8zdMT7ZKfoGQkQZjXF1YNhp4VHmfA=
+      rvm:
+        - 2.5.0
+      script:
+        - bundle exec rails db:migrate RAILS_ENV=test
+        - bundle exec rspec
+      after_failure:
+        - mysql -e 'show databases;'
+        - cat ./config/database.yml
+        - echo $RAILS_ENV
+        - bundle exec rake --version

docker-compose.yml

@@ -0,0 +1,41 @@
+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
+        ports:
+            - "8082:80"
+    backend:
+        build: generator2/org.getaviz.generator/
+        restart: always
+        volumes:
+            - ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war
+            - ./settings.properties:/opt/config/settings.properties
+            - ./generator2/output:/var/lib/jetty/output/
+            - ./generator2/databases:/var/lib/jetty/databases/
+        ports:
+            - "8083:8080"
+volumes:
+  bundle:
+    driver: local

evaluationserver/Dockerfile

@@ -6,6 +6,7 @@ RUN apt-get update \
 RUN mkdir -p /usr/src/app
 WORkDIR /usr/src/app/
 COPY . .
+RUN gem update --system
 RUN gem install bundler && bundle install --jobs 20 --retry 5 # might be better?
 RUN gem install bundler
 LABEL maintainer="[email protected]" \

evaluationserver/config.ru

@@ -1,4 +1,11 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
-run Rails.application
+require ::File.expand_path('../config/environment', __FILE__)
+
+if ENV['RAILS_RELATIVE_URL_ROOT']
+  map ENV['RAILS_RELATIVE_URL_ROOT'] do
+    run Rails.application
+  end
+else
+  run Rails.application
+end

evaluationserver/docker-compose.yml

@@ -16,12 +16,14 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="test-xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

generator/org.svis.app.analyzer.metrics/.classpath

@@ -28,7 +28,7 @@
 		<module>../org.svis.generator.run</module>
 	</modules>
 	<properties>
-		<xtext.version>2.13.0</xtext.version>
+		<xtext.version>2.15.0</xtext.version>
 		<mwe2.version>2.8.1</mwe2.version>
 		<emf.mwe>1.3.11</emf.mwe>
 		<clean.version>3.0.0</clean.version>
@@ -168,13 +168,6 @@
 					<groupId>org.eclipse.xtend</groupId>
 					<artifactId>xtend-maven-plugin</artifactId>
 					<version>${xtext.version}</version>
-					<dependencies>
-                        <dependency>
-                            <groupId>org.eclipse.platform</groupId>
-                            <artifactId>org.eclipse.equinox.common</artifactId>
-                            <version>3.10.0</version>
-                        </dependency>
-                    </dependencies>
 					<executions>
 						<execution>
 							<goals>

generator/org.svis.generator.releng/pom.xml

@@ -9,12 +9,14 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="test-xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">