Skip to content

Commit bbdd362

Browse files
author
David Baum
committed
Merge branch 'feature/docker_tomcat_generator' into development
2 parents 21176c4 + 19e403b commit bbdd362

44 files changed

Lines changed: 439 additions & 378 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.komodoproject
22
*/.idea
3+
4+
\.idea/

‎docker-compose.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: "3"
2+
services:
3+
#db:
4+
#image: mysql:5.7
5+
#environment:
6+
#MYSQL_ROOT_PASSWORD: dbpassword_for_user
7+
#MYSQL_DATABASE: eval_server_development
8+
#MYSQL_USER: db_username
9+
#MYSQL_PASSWORD: dbpassword_for_user
10+
#restart: always
11+
#eval:
12+
#build: evaluationserver
13+
#env_file: evaluationserver/env
14+
#command: "./bin/wait-for-it.sh db:3306 -s -t 30 -- ./bin/docker_start"
15+
#volumes:
16+
#- ./evaluationserver:/usr/src/app
17+
#ports:
18+
#- "8081:8081"
19+
#depends_on:
20+
#- db
21+
frontend:
22+
restart: always
23+
image: php:7.1.11-apache
24+
volumes:
25+
- ./ui:/var/www/html
26+
ports:
27+
- "8082:8082"
28+
backend:
29+
build: generator2/org.getaviz.generator/
30+
restart: always
31+
volumes:
32+
- ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war
33+
- ./settings.properties:/opt/config/settings.properties
34+
- ./generator2/output:/opt/output/
35+
- ./generator2/databases:/opt/databases/
36+
ports:
37+
- "8083:8080"
38+
#volumes:
39+
#bundle:
40+
#driver: local

‎evaluationserver/docker-compose.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎generator2/org.getaviz.generator/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>

‎generator2/org.getaviz.generator/Dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM jetty:9.4.12-jre8
2+
ADD target/org.getaviz.generator*.war /var/lib/jetty/webapps/root.war
3+
USER root
4+
RUN mkdir -p /usr/local/jetty/logs
5+
EXPOSE 8080
6+
VOLUME ["/var/lib/jetty/webapps/", "/opt/config/", "/opt/databases/"]
7+
LABEL maintainer="[email protected]" \
8+
version="1.0"

‎generator2/org.getaviz.generator/pom.xml‎

Lines changed: 97 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,26 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<relativePath>../org.getaviz.parent/pom.xml</relativePath>
7-
<groupId>org.getaviz</groupId>
8-
<artifactId>org.getaviz.parent</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10-
</parent>
5+
<groupId>org.getaviz</groupId>
116
<artifactId>org.getaviz.generator</artifactId>
7+
<version>1.0.0-SNAPSHOT</version>
128
<name>Getaviz Generator</name>
9+
<url>https://github.com/getaviz/Getaviz</url>
10+
<packaging>war</packaging>
1311
<distributionManagement>
1412
<site>
1513
<id>${project.artifactId}-site</id>
1614
<url>${project.baseUri}</url>
1715
</site>
1816
</distributionManagement>
17+
<properties>
18+
<xtend.version>2.16.0</xtend.version>
19+
<neo4j.version>3.5.1</neo4j.version>
20+
<junit.jupiter.version>5.3.1</junit.jupiter.version>
21+
<dependency.locations.enabled>false</dependency.locations.enabled>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
</properties>
1924
<dependencies>
20-
<!-- Internal Dependencies -->
21-
<dependency>
22-
<groupId>org.getaviz.lib.database</groupId>
23-
<artifactId>org.getaviz.lib.database</artifactId>
24-
<version>1.0.0-SNAPSHOT</version>
25-
</dependency>
26-
<!-- External Dependencies -->
27-
2825
<!-- Apache Commons -->
2926
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
3027
<dependency>
@@ -56,19 +53,13 @@
5653
<artifactId>commons-configuration2</artifactId>
5754
<version>2.4</version>
5855
</dependency>
59-
60-
<!-- Other -->
61-
<!-- https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib -->
6256
<dependency>
63-
<groupId>org.eclipse.xtend</groupId>
64-
<artifactId>org.eclipse.xtend.lib</artifactId>
65-
<version>${xtend.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>com.google.guava</groupId>
69-
<artifactId>guava</artifactId>
70-
<version>19.0-rc3</version>
57+
<groupId>commons-beanutils</groupId>
58+
<artifactId>commons-beanutils</artifactId>
59+
<version>1.9.3</version>
7160
</dependency>
61+
62+
<!-- neo4j -->
7263
<!-- https://mvnrepository.com/artifact/org.neo4j/neo4j-graphdb-api -->
7364
<dependency>
7465
<groupId>org.neo4j</groupId>
@@ -81,11 +72,30 @@
8172
<artifactId>neo4j-resource</artifactId>
8273
<version>${neo4j.version}</version>
8374
</dependency>
84-
<!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
8575
<dependency>
86-
<groupId>commons-beanutils</groupId>
87-
<artifactId>commons-beanutils</artifactId>
88-
<version>1.9.3</version>
76+
<groupId>org.neo4j</groupId>
77+
<artifactId>neo4j</artifactId>
78+
<version>${neo4j.version}</version>
79+
</dependency>
80+
<!-- https://mvnrepository.com/artifact/org.neo4j.test/neo4j-harness -->
81+
<dependency>
82+
<groupId>org.neo4j.test</groupId>
83+
<artifactId>neo4j-harness</artifactId>
84+
<version>${neo4j.version}</version>
85+
<scope>test</scope>
86+
</dependency>
87+
88+
<!-- Other -->
89+
<!-- https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib -->
90+
<dependency>
91+
<groupId>org.eclipse.xtend</groupId>
92+
<artifactId>org.eclipse.xtend.lib</artifactId>
93+
<version>${xtend.version}</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.google.guava</groupId>
97+
<artifactId>guava</artifactId>
98+
<version>19.0-rc3</version>
8999
</dependency>
90100
<dependency>
91101
<groupId>com.vividsolutions</groupId>
@@ -96,25 +106,25 @@
96106
<dependency>
97107
<groupId>org.junit.jupiter</groupId>
98108
<artifactId>junit-jupiter-api</artifactId>
99-
<version>5.3.1</version>
109+
<version>${junit.jupiter.version}</version>
100110
<scope>test</scope>
101111
</dependency>
102112
<dependency>
103113
<groupId>org.junit.jupiter</groupId>
104114
<artifactId>junit-jupiter-engine</artifactId>
105-
<version>5.3.1</version>
115+
<version>${junit.jupiter.version}</version>
106116
<scope>test</scope>
107117
</dependency>
108118
<dependency>
109119
<groupId>org.junit.vintage</groupId>
110120
<artifactId>junit-vintage-engine</artifactId>
111-
<version>5.3.1</version>
121+
<version>${junit.jupiter.version}</version>
112122
<scope>test</scope>
113123
</dependency>
114124
<dependency>
115125
<groupId>org.junit.platform</groupId>
116126
<artifactId>junit-platform-launcher</artifactId>
117-
<version>1.1.0</version>
127+
<version>1.3.2</version>
118128
<scope>test</scope>
119129
</dependency>
120130
<dependency>
@@ -123,17 +133,60 @@
123133
<version>1.1.0</version>
124134
<scope>test</scope>
125135
</dependency>
126-
<!-- https://mvnrepository.com/artifact/org.neo4j.test/neo4j-harness -->
136+
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
127137
<dependency>
128-
<groupId>org.neo4j.test</groupId>
129-
<artifactId>neo4j-harness</artifactId>
130-
<version>3.4.9</version>
131-
<scope>test</scope>
138+
<groupId>javax.servlet</groupId>
139+
<artifactId>javax.servlet-api</artifactId>
140+
<version>4.0.1</version>
141+
<scope>provided</scope>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.apache.logging.log4j</groupId>
145+
<artifactId>log4j-core</artifactId>
146+
<version>2.11.1</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.eclipse.xtend</groupId>
150+
<artifactId>xtend-maven-plugin</artifactId>
151+
<version>${xtend.version}</version>
132152
</dependency>
133153
</dependencies>
134154
<build>
135155
<sourceDirectory>src</sourceDirectory>
136156
<plugins>
157+
<plugin>
158+
<groupId>org.eclipse.xtend</groupId>
159+
<artifactId>xtend-maven-plugin</artifactId>
160+
<version>${xtend.version}</version>
161+
<configuration>
162+
<outputDirectory>${basedir}/xtend-gen</outputDirectory>
163+
<testOutputDirectory>${basedir}/test-xtend-gen</testOutputDirectory>
164+
</configuration>
165+
<executions>
166+
<execution>
167+
<goals>
168+
<goal>compile</goal>
169+
<goal>testCompile</goal>
170+
</goals>
171+
</execution>
172+
</executions>
173+
</plugin>
174+
<plugin>
175+
<groupId>org.apache.maven.plugins</groupId>
176+
<artifactId>maven-compiler-plugin</artifactId>
177+
<version>3.8.0</version>
178+
<configuration>
179+
<source>1.8</source>
180+
<target>1.8</target>
181+
<useIncrementalCompilation>true</useIncrementalCompilation>
182+
</configuration>
183+
<executions>
184+
<execution>
185+
<id>default-testCompile</id>
186+
<phase>none</phase>
187+
</execution>
188+
</executions>
189+
</plugin>
137190
<plugin>
138191
<groupId>org.apache.maven.plugins</groupId>
139192
<artifactId>maven-surefire-plugin</artifactId>
@@ -180,6 +233,7 @@
180233
<includeProjectDependencies>true</includeProjectDependencies>
181234
<includePluginDependencies>true</includePluginDependencies>
182235
<arguments>
236+
<argument>-Dlog4j.configuration=file:src/main/resources/log4j-console.properties</argument>
183237
<!-- uncomment to increase java heap size -->
184238
<argument>-Xmx8g</argument>
185239
<argument>-classpath</argument>
@@ -190,6 +244,11 @@
190244
</arguments>
191245
</configuration>
192246
</plugin>
247+
<plugin>
248+
<groupId>org.apache.maven.plugins</groupId>
249+
<artifactId>maven-war-plugin</artifactId>
250+
<version>3.2.2</version>
251+
</plugin>
193252
</plugins>
194253
</build>
195254
<reporting>

generator2/org.getaviz.generator/src/log4j.properties renamed to generator2/org.getaviz.generator/src/main/resources/log4j-console.properties

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Root logger option
2-
log4j.rootLogger=DEBUG, file, stdout
2+
log4j.rootLogger=DEBUG, stdout, file
33
log4j.logger.org.apache.commons.beanutils.converters=ERROR
44

55
# Redirect log messages to console
@@ -12,9 +12,7 @@ log4j.appender.stdout.Threshold=INFO
1212
# Direct log messages to a log file
1313
log4j.appender.file=org.apache.log4j.FileAppender
1414
log4j.appender.file.Append=false
15-
log4j.appender.file.File=./output/debug.log
16-
#log4j.appender.file.MaxFileSize=50MB
17-
#log4j.appender.file.MaxBackupIndex=10
15+
log4j.appender.file.File=output/debug.log
1816
log4j.appender.file.layout=org.apache.log4j.PatternLayout
1917
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
2018
log4j.appender.file.Threshold=DEBUG

‎generator2/org.getaviz.generator/src/main/resources/log4j.properties‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Root logger option
2+
log4j.rootLogger=DEBUG, file
3+
log4j.logger.org.apache.commons.beanutils.converters=ERROR
4+
5+
Direct log messages to a log file
6+
log4j.appender.file=org.apache.log4j.FileAppender
7+
log4j.appender.file.Append=false
8+
log4j.appender.file.File=${jetty.home}/logs/jetty.log
9+
log4j.appender.file.layout=org.apache.log4j.PatternLayout
10+
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
11+
log4j.appender.file.Threshold=DEBUG

generator2/org.getaviz.generator/settings.properties renamed to generator2/org.getaviz.generator/src/main/resources/settings.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
# Directory of the used jQAssistant database, relative to the directory of this project
2222
# database_name = ../databases/graph.db
23+
database_name = /opt/databases/graph.db
24+
2325

2426
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
2527
# #

‎generator2/org.getaviz.generator/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
2+
<servlet>
3+
<servlet-name>Getaviz Generator</servlet-name>
4+
<servlet-class>org.getaviz.generator.GeneratorServlet</servlet-class>
5+
</servlet>
6+
<servlet-mapping>
7+
<servlet-name>Getaviz Generator</servlet-name>
8+
<url-pattern>/*</url-pattern>
9+
</servlet-mapping>
10+
</web-app>

0 commit comments

Comments
 (0)