Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Created HTTP+MQTT package: FROST-Server.MQTTP and removed MQTT from F…
…ROST-Server.HTTP
- Loading branch information
Showing
26 changed files
with
2,300 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| From tomcat:8-jre8 | ||
|
|
||
| ADD http://repo.maven.apache.org/maven2/org/postgresql/postgresql/9.4.1212/postgresql-9.4.1212.jar /usr/local/tomcat/lib/ | ||
| ADD http://repo.maven.apache.org/maven2/net/postgis/postgis-jdbc/2.2.1/postgis-jdbc-2.2.1.jar /usr/local/tomcat/lib/ | ||
|
|
||
| # Copy to images tomcat path | ||
| ARG WAR_FILE | ||
| ADD target/${WAR_FILE} /usr/local/tomcat/webapps/FROST-Server.war |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project-shared-configuration> | ||
| <!-- | ||
| This file contains additional configuration written by modules in the NetBeans IDE. | ||
| The configuration is intended to be shared among all the users of project and | ||
| therefore it is assumed to be part of version control checkout. | ||
| Without this configuration present, some functionality in the IDE may be limited or fail altogether. | ||
| --> | ||
| <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1"> | ||
| <!-- | ||
| Properties that influence various parts of the IDE, especially code formatting and the like. | ||
| You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up. | ||
| That way multiple projects can share the same settings (useful for formatting rules for example). | ||
| Any value defined here will override the pom.xml file value but is only applicable to the current project. | ||
| --> | ||
| <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion> | ||
| <org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>js/libs</org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder> | ||
| <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server> | ||
| <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap> | ||
| <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width> | ||
| <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab> | ||
| <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size>4</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size> | ||
| <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width> | ||
| <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab>4</org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.project.tab-size>8</org-netbeans-modules-editor-indent.CodeStyle.project.tab-size> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width>80</org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> | ||
| <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile> | ||
| <org-netbeans-modules-whitelist.whitelist-oracle>false</org-netbeans-modules-whitelist.whitelist-oracle> | ||
| </properties> | ||
| </project-shared-configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>de.fraunhofer.iosb.ilt.FROST-Server</groupId> | ||
| <artifactId>FROST-ServerParent</artifactId> | ||
| <version>1.6-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <artifactId>FROST-Server.MQTTP</artifactId> | ||
| <packaging>war</packaging> | ||
|
|
||
| <name>FROST-Server.MQTTP</name> | ||
| <description>The web-application making the FROST-Server available over HTTP and MQTT.</description> | ||
| <url>https://github.com/FraunhoferIOSB/FROST-Server</url> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <docker-image-name>fraunhoferiosb/frost-server</docker-image-name> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>FROST-Server.Core</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>FROST-Server.SQL</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>FROST-Server.SQL.PGLong</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>FROST-Server.SQL.PGString</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>FROST-Server.SQL.PGUuid</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>FROST-Server.MQTT.Moquette</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.httpcomponents</groupId> | ||
| <artifactId>httpclient</artifactId> | ||
| <version>${httpclient.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax</groupId> | ||
| <artifactId>javaee-web-api</artifactId> | ||
| <version>7.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-classic</artifactId> | ||
| <version>${logback.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.1</version> | ||
| <configuration> | ||
| <source>${maven.compiler.source}</source> | ||
| <target>${maven.compiler.target}</target> | ||
| <compilerArguments> | ||
| <endorseddirs>${endorsed.dir}</endorseddirs> | ||
| </compilerArguments> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <version>3.2.0</version> | ||
| <configuration> | ||
| <archiveClasses>true</archiveClasses> | ||
| <attachClasses>true</attachClasses> | ||
| <failOnMissingWebXml>false</failOnMissingWebXml> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <version>2.6</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>copy</goal> | ||
| </goals> | ||
| <configuration> | ||
| <outputDirectory>${endorsed.dir}</outputDirectory> | ||
| <silent>true</silent> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>javax</groupId> | ||
| <artifactId>javaee-endorsed-api</artifactId> | ||
| <version>7.0</version> | ||
| <type>jar</type> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.spotify</groupId> | ||
| <artifactId>dockerfile-maven-plugin</artifactId> | ||
| <version>${dockerfile-maven-plugin.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>build-and-tag-latest</id> | ||
| <phase>none</phase> | ||
| <goals> | ||
| <goal>build</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>tag-version</id> | ||
| <phase>none</phase> | ||
| <goals> | ||
| <goal>tag</goal> | ||
| </goals> | ||
| <configuration> | ||
| <tag>${project.version}</tag> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>push-latest</id> | ||
| <phase>none</phase> | ||
| <goals> | ||
| <goal>push</goal> | ||
| </goals> | ||
| <configuration> | ||
| <tag>latest</tag> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>push-version</id> | ||
| <phase>none</phase> | ||
| <goals> | ||
| <goal>push</goal> | ||
| </goals> | ||
| <configuration> | ||
| <tag>${project.version}</tag> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <repository>${docker-image-name}</repository> | ||
| <buildArgs> | ||
| <WAR_FILE>${project.build.finalName}.war</WAR_FILE> | ||
| </buildArgs> | ||
| </configuration> | ||
| <dependencies> | ||
| <!-- Java 9 support --> | ||
| <dependency> | ||
| <groupId>javax.activation</groupId> | ||
| <artifactId>activation</artifactId> | ||
| <version>${javax-activation.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
Oops, something went wrong.