Skip to content

Commit

Permalink
remove debug
Browse files Browse the repository at this point in the history
  • Loading branch information
interrogator committed Jun 10, 2020
1 parent 95ab5f9 commit 020d16f
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ deploy:
provider: releases
api_key:
secure: OOf6dUTmmHm2AbqAiqpUVkG2ByFC8cnneLMDHbeirTs+oS4PTPO9jVc0sKKx9E6m4q/rjTg976t2F9j/xHfNJWaacq0u/tdbDHWHVI35sLGlYwovf1iPApGWtrmdL3dB7rL9lR57wrR4uPsYWOrmNO7C9x7vtX4UXtroecynUZkwRG1eXlO89hXW1PfIrKeSFyMzXipzG1o++2fQp4VKCF82yPz5gZ5lxl8VelZBfWTkTkrzvLDBhNN7tRwKlkULW90mmyxwFHnHtkkarbpithxSJlcsh0+oG4LYu1Irapf+TGUAEMEnZzxQqz2ZMIA6BcnydJwKno8zLWwtXLFXRd7XBHoO6mBfX3hxq8t6FS8U3/0CPJxCQSJQpMxQ5pvbzXEUbwZIE4IBwXdiJq2JZbbljoo/2hKmEOXXOxNkXTj1iOfZvDpscyCmfwkEkF25HTBROFmR7lL4DRAt/U4DejBD52iFmzJ+Sd09SG/ViTNDudTXaiVsUJpXh0ORqJyUu3hS0KerCPB2uX5QkU5disb6TLOkF5b63833kXghHrhC6i8QVcIL3lgnV+MRJSim8wjnsXkV4wAcUZtOs/+zzAaL5QVS/A0PPZuT4djKSZIEk4AHeK+nCcBW3lbH2v7xsGFNax0pTh/bBQQORcI6X4NKxaQNFWid549roS8jUYk=
file: backend/target/backend-1.0.7.war
file: backend/target/backend-1.0.8.war
skip_cleanup: true
name: marugoto - $(date +'%d.%m.%Y %R')
on:
Expand Down
2 changes: 1 addition & 1 deletion DockerfileMiddleware
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM tomcat:9.0.13-jre10
RUN rm -rf /usr/local/tomcat/webapps/*

# transfer web application
COPY backend/target/backend-1.0.7.war /usr/local/tomcat/webapps/ROOT.war
COPY backend/target/backend-1.0.8.war /usr/local/tomcat/webapps/ROOT.war

# default tomcat port
EXPOSE 8080
2 changes: 1 addition & 1 deletion DockerfileShell
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM openjdk:10-jre

# transfer shell application
COPY shell/target/shell-1.0.7.jar /opt/shell.jar
COPY shell/target/shell-1.0.8.jar /opt/shell.jar

# Prepare the mount
RUN mkdir -p /home && sed -re '1s|:/root:|:/home:|' -i /etc/passwd;
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ mvnw package -DskipTests
The packaged ``*.war``-file can be found under:

```console
backend/target/backend-1.0.7.war
backend/target/backend-1.0.8.war
```

To run the ``war``-file, switch to backend/target and execute the following command:

```console
java -jar backend-1.0.7.war
java -jar backend-1.0.8.war
```
To check api-docs(swagger) type in your browser:

Expand All @@ -47,13 +47,13 @@ mvnw package -Dmaven.test.skip=true
The packaged ``*.jar``-file can be found unter:

```console
shell/target/shell-1.0.7.jar
shell/target/shell-1.0.8.jar
```

To run the ``jar``-file, execute the following command:

```console
java -jar shell-1.0.7.jar
java -jar shell-1.0.8.jar
```

Type ``help`` into the shell-terminal to get a list of available commands.
Expand Down
2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>ch.uzh.marugoto</groupId>
<artifactId>parent</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>ch.uzh.marugoto</groupId>
<artifactId>parent</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ public CharSequence renderImageComponent(final Component component, String resou
String imagePath = imageComponent.getImages().get(0).getPath();
StringBuilder htmlBuilder = new StringBuilder();
htmlBuilder.append("<div class='component image-component'>");
htmlBuilder.append("<span>" + resourcesPath.concat("/").concat(imagePath) + "</span>");
htmlBuilder.append("<span>" + resourcesPath.concat("/").concat(imagePath).replaceAll("//", "/") + "</span>");
// the line below produced // at some point. make sure there is only one
htmlBuilder.append("<img src='" + resourcesPath.concat("/").concat(imagePath).replaceAll("//", "/") + "' alt='Image' />");
if (imageComponent.getCaption() != null) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.uzh.marugoto</groupId>
<artifactId>parent</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
<packaging>pom</packaging>
<name>parent</name>
<modules>
Expand Down
4 changes: 2 additions & 2 deletions shell/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>ch.uzh.marugoto</groupId>
<artifactId>parent</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -34,7 +34,7 @@
<dependency>
<groupId>ch.uzh.marugoto</groupId>
<artifactId>core</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down

0 comments on commit 020d16f

Please sign in to comment.