Skip to content

Commit

Permalink
Merged developer into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@abainczyk
abainczyk committed Oct 13, 2016
2 parents 4dd51d0 + b945226 commit c0457c3
Show file tree
Hide file tree
Showing 460 changed files with 12,576 additions and 44,592 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.iml

# Java
main/logs
target
*.class
hs_err_pid*
Expand All @@ -12,8 +13,9 @@ main/src/main/webapp/node_modules
main/src/main/webapp/dist
main/src/main/webapp/tests/coverage
main/src/main/webapp/assets/fonts
main/src/main/webapp/assets/swagger-ui

# Auto Generated Swagger Doc
main/src/main/webapp/restdocs/docs
main/src/main/webapp/restdocs

main/uploads
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# ALEX v1.2

## Features

* New actions:
* Press special keys like enter, ctrl, etc.
* Check the value of an elements attribute
* New equivalence oracle: hypothesis
* Test symbols without starting a learning process
* Support for the edge driver

# ALEX v1.1.2

## Breaking Changes
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>de.learnlib.alex</groupId>
<artifactId>alex-parent</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
7 changes: 7 additions & 0 deletions api/src/main/java/de/learnlib/alex/annotations/LearnAlgorithm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,16 @@

package de.learnlib.alex.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Annotation for LearnAlgorithm factories.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface LearnAlgorithm {

/**
Expand Down
154 changes: 82 additions & 72 deletions main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>de.learnlib.alex</groupId>
<artifactId>alex-parent</artifactId>
<version>1.1.2</version>
<version>1.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -20,8 +20,9 @@
</description>

<properties>
<spring-boot.version>1.3.5.RELEASE</spring-boot.version>
<log4j.version>2.6.1</log4j.version>
<spring.version>4.3.3.RELEASE</spring.version>
<spring-boot.version>1.4.1.RELEASE</spring-boot.version>
<log4j.version>2.6.2</log4j.version>
<start-class>de.learnlib.alex.App</start-class>
</properties>

Expand All @@ -35,70 +36,86 @@
</dependency>

<dependency>
<groupId>de.learnlib.alex</groupId>
<artifactId>processors</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<!-- needed to forece JBoss Logging 3.3.0.Final in all dependencies. This can eventually be removed. -->
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.0.Final</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<artifactId>spring-boot-starter-jersey</artifactId>
<version>${spring-boot.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jersey-bean-validation</artifactId>
<groupId>org.glassfish.jersey.ext</groupId>
</exclusion>
<exclusion>
<artifactId>bean-validator</artifactId>
<groupId>org.glassfish.hk2.external</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.2.6.RELEASE</version>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>

<!-- Hibernate -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.1.0.Final</version>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate5</artifactId>
<version>2.8.3</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring-boot.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-annotation-processor</artifactId>
<version>${hibernate.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>3.0.0</version>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.0</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.4</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
<scope>runtime</scope>
</dependency>

<!-- jose4j for jwt -->
Expand Down Expand Up @@ -180,40 +197,29 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>2.21</version>
<version>${htmlunitdriver.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>2.53.1</version>
</dependency>

<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>

<!-- Log4J -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
<version>${log4j.version}</version>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-edge-driver</artifactId>
<version>${selenium.version}</version>
</dependency>


<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j.version}</version>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>

<!--== Testing ==-->
Expand Down Expand Up @@ -241,7 +247,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -316,7 +322,7 @@
<goal>repackage</goal>
</goals>
</execution>
<execution>
<!--<execution>
<id>server-start</id>
<phase>pre-integration-test</phase>
<goals>
Expand All @@ -329,7 +335,7 @@
<goals>
<goal>stop</goal>
</goals>
</execution>
</execution>-->
</executions>
</plugin>

Expand All @@ -354,7 +360,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<version>2.19.1</version>
<configuration>
<systemProperties>
<property>
Expand Down Expand Up @@ -386,13 +392,17 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.2.12</version>
<version>0.4.13</version>
<configuration>
<imageName>alex:${project.version}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>src/docker</dockerDirectory>
<resources>
<resource>
<targetPath>.</targetPath>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.war</include>
</resource>
Expand Down Expand Up @@ -422,16 +432,16 @@
<goal>javadoc-no-fork</goal>
</goals>
<configuration>
<doclet>com.carma.swagger.doclet.ServiceDoclet</doclet>
<doclet>com.tenxerconsulting.swagger.doclet.ServiceDoclet</doclet>
<docletArtifact>
<groupId>com.carma</groupId>
<groupId>com.tenxerconsulting</groupId>
<artifactId>swagger-doclet</artifactId>
<version>1.1.1</version>
<version>1.1.3</version>
</docletArtifact>
<reportOutputDirectory>${basedir}/src/main/webapp</reportOutputDirectory>
<useStandardDocletOptions>false</useStandardDocletOptions>
<additionalparam>-apiVersion 1 -docBasePath /restdocs/docs -apiBasePath /rest -disableCopySwaggerUi</additionalparam>
<destDir>restdocs/docs</destDir> <!-- not the apidocs folder -->
<additionalparam>-apiVersion 1.2 -docBasePath /restdocs -apiBasePath /rest -disableCopySwaggerUi</additionalparam>
<destDir>restdocs</destDir> <!-- not the apidocs folder -->
</configuration>
</execution>
</executions>
Expand Down
28 changes: 23 additions & 5 deletions main/src/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,35 @@
FROM java:8

# Set our working driectory for the rest of this files
WORKDIR /usr/src/alex

# Install Firefox and Chrome, with all the needed deepencies,
# including the Chrome Driver and the Marionette / Gecko Driver for Selenium.
# This also includes the Xvfb to run them both in a headless mode.
RUN apt-get update && apt-get install -y --no-install-recommends \
chromium \
iceweasel \
xvfb \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*e

ADD ALEX-*.war /usr/src/alex/ALEX.war
ADD run.sh /usr/src/alex/run.sh
RUN chmod a+x /usr/src/alex/run.sh
ADD chromedriver chromedriver
ADD geckodriver geckodriver

WORKDIR /usr/src/alex

# Finally add ALEX and our startup script.
ADD ALEX-*.war ALEX.war

ADD run.sh run.sh
RUN chmod a+x run.sh


# Last refinements to the envoirment and the image.
ENV DISPLAY :99
ENV WEBDRIVER.CHROME.DRIVER chromedriver
ENV WEBDRIVER.GECKO.DRIVER geckodriver

EXPOSE 8000


# here we go
ENTRYPOINT "./run.sh"
4 changes: 3 additions & 1 deletion main/src/docker/run.sh
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#!/usr/bin/env bash

Xvfb :99 -screen 0 1024x768x16 &
java -jar ALEX.war
java -Dwebdriver.chrome.driver=chromedriver -Dwebdriver.gecko.driver=geckodriver -jar ALEX.war
Loading

0 comments on commit c0457c3

Please sign in to comment.