Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #12 #13

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Closes #12 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
876a927
Adjust pom.xml, dockerize
bpross-52n Jan 23, 2025
687704a
Adjust site-descriptor
bpross-52n Jan 23, 2025
ac25a2c
Add .gitignore
bpross-52n Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
target
.project
.settings/
167 changes: 78 additions & 89 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
<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>
<artifactId>ets-sos10</artifactId>
<groupId>org.opengis.cite</groupId>
<version>1.15-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-common</artifactId>
<version>6</version>
<version>15-SNAPSHOT</version>
</parent>

<name>Conformance Test Suite - OGC Sensor Observation Service</name>
Expand Down Expand Up @@ -48,51 +47,74 @@
<ets-code>sos</ets-code>
<spec-version>1.0.0</spec-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<teamengine.version>4.0.5</teamengine.version>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<!-- Dummy plugin to configure Eclipse m2e plug-in only -->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<groupId>com.smartbear.soapui</groupId>
<artifactId>soapui-maven-plugin</artifactId>
<configuration>
<projectFile>src/test/resources/soapui/ets-sos20-soapui-project.xml</projectFile>
<settingsFile>src/test/resources/soapui/ets-sos20-soapui-settings.xml</settingsFile>
<projectProperties>
<value>teamengine.endpoint=${soapui.teamengine.endpoint}</value>
<value>teamengine.user=${soapui.teamengine.user}</value>
<value>teamengine.password=${soapui.teamengine.password}</value>
<value>iut=${soapui.iut}</value>
<value>tests.passed=${soapui.tests.passed}</value>
<value>tests.skipped=${soapui.tests.skipped}</value>
<value>tests.failed=${soapui.tests.failed}</value>
</projectProperties>
</configuration>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<versionRange>[1.5,)</versionRange>
<goals>
<goal>process</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
<images>
<image>
<name>ogccite/${project.artifactId}</name>
<build>
<dockerFileDir>${project.basedir}/src/docker</dockerFileDir>
<tags>
<tag>${project.version}-teamengine-${teamengine.version}</tag>
</tags>
<assembly>
<inline>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>dependency/*teamengine-*.war</include>
<include>dependency/*teamengine-*.zip</include>
<include>*ets-*.zip</include>
</includes>
</fileSet>
</fileSets>
</inline>
</assembly>
</build>
<run>
<ports>
<port>8081:8080</port>
</ports>
<wait>
<http>
<url>http://localhost:8081/teamengine</url>
</http>
<time>120000</time>
</wait>
</run>
</image>
</images>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<phase>disable</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
Expand All @@ -111,77 +133,44 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<executions>
<execution>
<id>site-package</id>
<phase>prepare-package</phase>
<goals>
<goal>site</goal>
</goals>
</execution>
</executions>
<configuration>
<relativizeDecorationLinks>false</relativizeDecorationLinks>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
<releaseProfiles>release</releaseProfiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<id>docker</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>build</id>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push</id>
<goals>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
<goal>copy</goal>
</goals>
<configuration>
<!-- Enable if GPG 2.1+ is used -->
<!--<gpgArguments>
<arg>&#45;&#45;pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>-->
</configuration>
</execution>
</executions>
</plugin>
Expand Down
27 changes: 27 additions & 0 deletions src/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM tomcat:10.1-jre17

RUN apt update && apt install -y unzip

# add TEAM Engine webapp
ADD maven/dependency/teamengine-web-*.war /root/
RUN cd /root/ && unzip -q teamengine-web-*.war -d /usr/local/tomcat/webapps/teamengine

# add TEAM Engine common libs
ADD maven/dependency/teamengine-web-*-common-libs.zip /root/
RUN cd /root/ && unzip -q teamengine-web-*-common-libs.zip -d /usr/local/tomcat/lib

# add TEAM Engine console
ADD maven/dependency/teamengine-console-*-base.zip /root/
RUN cd /root/ && unzip -q teamengine-console-*-base.zip -d /root/te_base

# set TE_BASE
ENV JAVA_OPTS="-Xms1024m -Xmx2048m -DTE_BASE=/root/te_base"

# add ETS
ADD maven/ets-sos10-*-ctl.zip /root/
RUN cd /root/ && unzip -q ets-sos10-*-ctl.zip -d /root/te_base/scripts

RUN rm -R /root/te_base/scripts/note

# run tomcat
CMD ["catalina.sh", "run"]
8 changes: 4 additions & 4 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="${project.name}"
xmlns="http://maven.apache.org/DECORATION/1.4.0"
xmlns="http://maven.apache.org/DECORATION/1.7.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.3.1</version>
<version>2.0.1</version>
</skin>
<custom>
<fluidoSkin>
<fluidoSkin>o
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
Expand Down