This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new f041d77 PLC4X-97 - Anchors display under the page heading - Changed
the distance for h2 headers
f041d77 is described below
commit f041d77c20aa80f7d88526ba31edf20920f6d6fa
Author: Christofer Dutz <[email protected]>
AuthorDate: Mon Mar 18 14:06:43 2019 +0100
PLC4X-97 - Anchors display under the page heading
- Changed the distance for h2 headers
NO JIRA
- Fine-tuned the site generation to re-use most od the css and js resources
- Renamed the "img" directory to "images" in order to merge the two image
directories
---
plc4j/protocols/ads/src/site/asciidoc/index.adoc | 2 +-
.../{img => images}/WAGO_enip_exporer.png | Bin
plc4j/protocols/s7/src/site/asciidoc/index.adoc | 2 +-
.../asciidoc/developers/implementing-drivers.adoc | 2 +-
plc4j/src/site/asciidoc/index.adoc | 2 +-
pom.xml | 146 ++++++---------------
protocols/knxnet-ip/src/site/asciidoc/index.adoc | 2 +-
src/site/asciidoc/community/conferences.adoc | 2 +-
src/site/asciidoc/community/getting-involved.adoc | 2 +-
src/site/asciidoc/developers/ci.adoc | 2 +-
src/site/asciidoc/developers/contributing.adoc | 2 +-
src/site/asciidoc/developers/decisions.adoc | 2 +-
src/site/asciidoc/developers/jqassistant.adoc | 2 +-
src/site/asciidoc/developers/release.adoc | 2 +-
src/site/asciidoc/developers/vpn.adoc | 2 +-
src/site/asciidoc/index.adoc | 2 +-
src/site/asciidoc/protocols/delta-v/index.adoc | 2 +-
src/site/asciidoc/protocols/delta-v/read-data.adoc | 2 +-
.../protocols/delta-v/reverse-engineering.adoc | 2 +-
src/site/asciidoc/protocols/s7/index.adoc | 2 +-
src/site/asciidoc/protocols/s7/s7comm-plus.adoc | 2 +-
src/site/asciidoc/protocols/s7/s7comm.adoc | 2 +-
src/site/resources/css/site.css | 14 +-
.../PLC4X_rollup_83x237cm-final.pdf | 0
.../{img => images}/apache_brooklyn_logo.png | Bin
.../{img => images}/apache_camel_logo.png | Bin
.../{img => images}/apache_edgent_logo.png | Bin
.../{img => images}/apache_kafka_logo.png | Bin
.../{img => images}/apache_mynewt_logo.png | Bin
.../resources/{img => images}/apache_nifi_logo.svg | 0
.../{img => images}/apache_plc4x_logo.png | Bin
.../{img => images}/community-contribute-fork.png | Bin
src/site/resources/{img => images}/iot-lab.jpg | Bin
.../neo4j-intellij-database-connections-view.png | Bin
.../neo4j-intellij-query-results.png | Bin
.../{img => images}/neo4j-intellij-settings.png | Bin
.../{img => images}/neo4j-web-console.png | Bin
.../{img => images}/plc4x-vpn-beckhoff-route-1.png | Bin
.../{img => images}/plc4x-vpn-beckhoff-route-2.png | Bin
.../{img => images}/plc4x-vpn-beckhoff-route-3.png | Bin
.../{img => images}/plc4x-vpn-beckhoff.jpg | Bin
.../{img => images}/plc4x-vpn-client-download.png | Bin
.../resources/{img => images}/plc4x-vpn-fatek.jpg | Bin
.../{img => images}/plc4x-vpn-siemens-hmi.jpg | Bin
.../{img => images}/plc4x-vpn-siemens-s7.jpg | Bin
.../resources/{img => images}/plc4x-vpn-wago.jpg | Bin
...release-git-diff-next-development-iteration.png | Bin
.../release-git-diff-prepare-release.png | Bin
.../{img => images}/release-git-history.png | Bin
src/site/site.xml | 7 +-
50 files changed, 78 insertions(+), 129 deletions(-)
diff --git a/plc4j/protocols/ads/src/site/asciidoc/index.adoc
b/plc4j/protocols/ads/src/site/asciidoc/index.adoc
index 3c4d266..c32ea1d 100644
--- a/plc4j/protocols/ads/src/site/asciidoc/index.adoc
+++ b/plc4j/protocols/ads/src/site/asciidoc/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ./img/
+:imagesdir: ./images/
== ADS Protocol Java Implementation
diff --git
a/plc4j/protocols/ethernet-ip/src/site/resources/img/WAGO_enip_exporer.png
b/plc4j/protocols/ethernet-ip/src/site/resources/images/WAGO_enip_exporer.png
similarity index 100%
rename from
plc4j/protocols/ethernet-ip/src/site/resources/img/WAGO_enip_exporer.png
rename to
plc4j/protocols/ethernet-ip/src/site/resources/images/WAGO_enip_exporer.png
diff --git a/plc4j/protocols/s7/src/site/asciidoc/index.adoc
b/plc4j/protocols/s7/src/site/asciidoc/index.adoc
index 671f048..fa5bd03 100644
--- a/plc4j/protocols/s7/src/site/asciidoc/index.adoc
+++ b/plc4j/protocols/s7/src/site/asciidoc/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ./img/
+:imagesdir: ./images/
== S7 Protocol Java Implementation
diff --git
a/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
b/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
index 899f796..f49c871 100644
--- a/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
+++ b/plc4j/protocols/src/site/asciidoc/developers/implementing-drivers.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ./../img/
+:imagesdir: ./../images/
== Implementing Drivers
diff --git a/plc4j/src/site/asciidoc/index.adoc
b/plc4j/src/site/asciidoc/index.adoc
index c73cba4..dcc6862 100644
--- a/plc4j/src/site/asciidoc/index.adoc
+++ b/plc4j/src/site/asciidoc/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: img/
+:imagesdir: images/
== About PLC4J
diff --git a/pom.xml b/pom.xml
index 795df6b..a47e6aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
<guava.version>27.0.1-jre</guava.version>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.9.8</jackson.version>
+ <jmh.version>1.21</jmh.version>
<jna.version>4.5.1</jna.version>
<joda-time.version>2.10</joda-time.version>
<jopt-simple.version>5.0.2</jopt-simple.version>
@@ -143,6 +144,7 @@
<t-digest.version>3.2</t-digest.version>
<!-- Site properties -->
+ <reflow.skin.version>1.5.0</reflow.skin.version>
<bootstrap.version>3.3.7</bootstrap.version>
<jquery.version>3.3.1</jquery.version>
<anchorjs.version>3.2.2</anchorjs.version>
@@ -713,6 +715,9 @@
<!-- JSON doesn't like comments -->
<exclude>**/*.json</exclude>
+
+ <!-- Output of the profiler maven extension -->
+ <exclude>**/.profiler/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -772,54 +777,36 @@
manually take care of fetching and packaging these external resources
with the generated site.
-->
- <!--
- The reflow maven skin used for the site-generation requires some
static resources.
- The following plugins configure the acquisition and location of
these resources.
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <!-- Only execute this for the parent module -->
+ <inherited>false</inherited>
<executions>
<execution>
- <id>unpack-js-deps</id>
+ <id>unpack</id>
<phase>pre-site</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
- <!--
- Bundle these dependencies in the war.
-
- You must maintain the corresponding info if you
- add/remove artifacts or change their versions:
- - entry in src/main/webapp/META-INF/LICENSE
- - entry in src/main/webapp/META-INF/NOTICE when appropriate
-
- You must maintain the info in the corresponding
- console/server files because it bundles this war.
-
- You must maintain the info in this project's
- corresponding platforms/java7 files.
- -->
<artifactItems>
<artifactItem>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- <version>${bootstrap.version}</version>
- <!-- We're replacing this by in the
get-flatly-bootstrap-theme execution a few lines down -->
-
<excludes>META-INF/resources/webjars/**/bootstrap.min.css</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- <version>${jquery.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.webjars</groupId>
- <artifactId>anchorjs</artifactId>
- <version>${anchorjs.version}</version>
+ <groupId>io.github.devacfr.maven.skins</groupId>
+ <artifactId>reflow-default-webdeps</artifactId>
+ <version>${reflow.skin.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <includes>
+ **/css/bootstrap.min.css,
+ **/css/fontawesome/*,
+ **/js/*.js,
+ **/js/languages/*,
+ **/js/styles/default.min.css
+ </includes>
</artifactItem>
</artifactItems>
+
<outputDirectory>${project.build.directory}/site</outputDirectory>
</configuration>
</execution>
</executions>
@@ -832,31 +819,17 @@
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.4.1</version>
+ <!-- Only execute this for the parent module -->
+ <inherited>false</inherited>
<executions>
<execution>
- <id>get-flatly-bootstrap-theme</id>
- <phase>pre-site</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://stackpath.bootstrapcdn.com/bootswatch/${bootstrap.version}/flatly/bootstrap.min.css</url>
- <outputDirectory>
-
${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/${bootstrap.version}/css/
- </outputDirectory>
- <outputFileName>bootstrap.min.css</outputFileName>
- </configuration>
- </execution>
- <execution>
<id>get-fontawesome</id>
<phase>pre-site</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
- <url>
-
https://use.fontawesome.com/releases/v${fontawesome.version}/fontawesome-free-${fontawesome.version}-web.zip
- </url>
+
<url>https://use.fontawesome.com/releases/v${fontawesome.version}/fontawesome-free-${fontawesome.version}-web.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/dependency/fontawesome</outputDirectory>
</configuration>
@@ -867,6 +840,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <!-- Only execute this for the parent module -->
+ <inherited>false</inherited>
<executions>
<execution>
<id>copy-site-resources</id>
@@ -879,25 +854,6 @@
<resources>
<resource>
<directory>
-
${project.build.directory}/dependency/META-INF/resources/webjars/anchorjs/${anchorjs.version}
- </directory>
- <targetPath>${project.build.directory}/site/js</targetPath>
- <includes>
- <include>anchor.min.js</include>
- </includes>
- </resource>
- <resource>
- <directory>
-
${project.build.directory}/dependency/META-INF/resources/webjars/bootstrap/${bootstrap.version}
- </directory>
- <includes>
- <include>css/bootstrap.min.css</include>
- <include>js/bootstrap.min.js</include>
- <include>fonts/**</include>
- </includes>
- </resource>
- <resource>
- <directory>
${project.build.directory}/dependency/fontawesome/fontawesome-free-${fontawesome.version}-web
</directory>
<includes>
@@ -910,14 +866,6 @@
</directory>
<targetPath>${project.build.directory}/site/fonts</targetPath>
</resource>
- <resource>
-
<directory>${project.build.directory}/dependency/META-INF/resources/webjars/jquery/${jquery.version}
- </directory>
- <targetPath>${project.build.directory}/site/js</targetPath>
- <includes>
- <include>jquery.min.js</include>
- </includes>
- </resource>
</resources>
</configuration>
</execution>
@@ -932,6 +880,8 @@
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
+ <!-- Only execute this for the parent module -->
+ <inherited>false</inherited>
<executions>
<execution>
<id>streamline-font-urls</id>
@@ -1068,7 +1018,7 @@
<asciidoc>
<attributes>
<source-highlighter>prettify</source-highlighter>
-
<imagesoutdir>${project.build.directory}/site/img</imagesoutdir>
+
<imagesoutdir>${project.build.directory}/site/images</imagesoutdir>
</attributes>
<requires>
<require>asciidoctor-diagram</require>
@@ -1080,7 +1030,7 @@
<dependency>
<groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
- <version>1.3.10</version>
+ <version>${reflow.skin.version}</version>
</dependency>
<!-- add support for scm/git site deployment -->
<dependency>
@@ -1163,7 +1113,7 @@
<reporting>
<plugins>
<!-- Generate the unit- and integration-test reports -->
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<reportSets>
@@ -1174,10 +1124,10 @@
</reports>
</reportSet>
</reportSets>
- </plugin>
+ </plugin-->
<!-- Generate a code coverage report -->
- <plugin>
+ <!--plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<reportSets>
@@ -1195,17 +1145,17 @@
</reports>
</reportSet>
</reportSets>
- </plugin>
+ </plugin-->
<!-- Add html friendly version of source files with line-numbers -->
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.0.0</version>
- </plugin>
+ </plugin-->
<!-- Generate javadoc documentation -->
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<reportSets>
@@ -1219,10 +1169,10 @@
<configuration>
<failOnError>true</failOnError>
</configuration>
- </plugin>
+ </plugin-->
<!-- Generates a changelog report from GIT commits -->
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
<reportSets>
@@ -1234,13 +1184,13 @@
</reportSet>
</reportSets>
<configuration>
- <!-- Automatically link Jira issues -->
+ <!- Automatically link Jira issues ->
<issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
</configuration>
- </plugin>
+ </plugin-->
<!-- Generates a dependency vulnerability -->
- <plugin>
+ <!--plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<reportSets>
@@ -1250,7 +1200,7 @@
</reports>
</reportSet>
</reportSets>
- </plugin>
+ </plugin-->
</plugins>
</reporting>
@@ -1266,16 +1216,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>daffodil-release</id>
-
<url>https://repository.apache.org/content/repositories/orgapachedaffodil-1008/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<profiles>
diff --git a/protocols/knxnet-ip/src/site/asciidoc/index.adoc
b/protocols/knxnet-ip/src/site/asciidoc/index.adoc
index f26b665..dda2161 100644
--- a/protocols/knxnet-ip/src/site/asciidoc/index.adoc
+++ b/protocols/knxnet-ip/src/site/asciidoc/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: img/
+:imagesdir: images/
:icons: font
== KNXNet/IP
diff --git a/src/site/asciidoc/community/conferences.adoc
b/src/site/asciidoc/community/conferences.adoc
index 8d63573..2af5ed4 100644
--- a/src/site/asciidoc/community/conferences.adoc
+++ b/src/site/asciidoc/community/conferences.adoc
@@ -40,4 +40,4 @@ If you've got or found any events or talks we might be
missing, please inform us
== Additional Material
-PLC4X [Banner](../img/PLC4X_rollup_83x237cm-final.pdf)
+PLC4X [Banner](../images/PLC4X_rollup_83x237cm-final.pdf)
diff --git a/src/site/asciidoc/community/getting-involved.adoc
b/src/site/asciidoc/community/getting-involved.adoc
index 25c6128..f465dad 100644
--- a/src/site/asciidoc/community/getting-involved.adoc
+++ b/src/site/asciidoc/community/getting-involved.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
== Getting Involved
diff --git a/src/site/asciidoc/developers/ci.adoc
b/src/site/asciidoc/developers/ci.adoc
index 7ee7020..a811fe2 100644
--- a/src/site/asciidoc/developers/ci.adoc
+++ b/src/site/asciidoc/developers/ci.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
== Continuous Integration
diff --git a/src/site/asciidoc/developers/contributing.adoc
b/src/site/asciidoc/developers/contributing.adoc
index 6b97d71..d224b4a 100644
--- a/src/site/asciidoc/developers/contributing.adoc
+++ b/src/site/asciidoc/developers/contributing.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
== Contributing
diff --git a/src/site/asciidoc/developers/decisions.adoc
b/src/site/asciidoc/developers/decisions.adoc
index c41813e..bdb6f89 100644
--- a/src/site/asciidoc/developers/decisions.adoc
+++ b/src/site/asciidoc/developers/decisions.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
== Decision Making
diff --git a/src/site/asciidoc/developers/jqassistant.adoc
b/src/site/asciidoc/developers/jqassistant.adoc
index 08d7b61..0bbbde5 100644
--- a/src/site/asciidoc/developers/jqassistant.adoc
+++ b/src/site/asciidoc/developers/jqassistant.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
== Using JQAssistant
diff --git a/src/site/asciidoc/developers/release.adoc
b/src/site/asciidoc/developers/release.adoc
index a33124c..214a3ea 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
:icons: font
== Releasing PLC4X
diff --git a/src/site/asciidoc/developers/vpn.adoc
b/src/site/asciidoc/developers/vpn.adoc
index af4a8f8..ba7f08e 100644
--- a/src/site/asciidoc/developers/vpn.adoc
+++ b/src/site/asciidoc/developers/vpn.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../img/
+:imagesdir: ../images/
== The PLC4X PLC VPN
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 3949c09..e81b3ee 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: img/
+:imagesdir: images/
:icons: font
== Apache PLC4X™ (Incubating): Universal Protocol Adapter for Industrial IoT
diff --git a/src/site/asciidoc/protocols/delta-v/index.adoc
b/src/site/asciidoc/protocols/delta-v/index.adoc
index 9605154..6137032 100644
--- a/src/site/asciidoc/protocols/delta-v/index.adoc
+++ b/src/site/asciidoc/protocols/delta-v/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../../img/
+:imagesdir: ../../images/
== DeltaV Industrial Ethernet Communication
diff --git a/src/site/asciidoc/protocols/delta-v/read-data.adoc
b/src/site/asciidoc/protocols/delta-v/read-data.adoc
index 2f11dfe..1be96cf 100644
--- a/src/site/asciidoc/protocols/delta-v/read-data.adoc
+++ b/src/site/asciidoc/protocols/delta-v/read-data.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../../img/
+:imagesdir: ../../images/
== 0x0403 (before registration)
diff --git a/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
b/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
index f41e046..558da7d 100644
--- a/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
+++ b/src/site/asciidoc/protocols/delta-v/reverse-engineering.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../../img/
+:imagesdir: ../../images/
== Reverse Engineering the DeltaV protocol
diff --git a/src/site/asciidoc/protocols/s7/index.adoc
b/src/site/asciidoc/protocols/s7/index.adoc
index d276686..01bb4bd 100644
--- a/src/site/asciidoc/protocols/s7/index.adoc
+++ b/src/site/asciidoc/protocols/s7/index.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../../img/
+:imagesdir: ../../images/
== S7 Communication
diff --git a/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
b/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
index 7be68b0..d3a9e19 100644
--- a/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
+++ b/src/site/asciidoc/protocols/s7/s7comm-plus.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../../img/
+:imagesdir: ../../images/
== S7 Comm Plus (0x72)
diff --git a/src/site/asciidoc/protocols/s7/s7comm.adoc
b/src/site/asciidoc/protocols/s7/s7comm.adoc
index 4e1e4c8..793716f 100644
--- a/src/site/asciidoc/protocols/s7/s7comm.adoc
+++ b/src/site/asciidoc/protocols/s7/s7comm.adoc
@@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-:imagesdir: ../../img/
+:imagesdir: ../../images/
== S7 Comm (0x32)
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index 148bd90..0063fee 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -68,11 +68,19 @@ under the License.
}
/* Set where the focus will be set when using anchor links */
-h1[id]:before, h2[id]:before, h3[id]:before, h4[id]:before, h5[id]:before,
h6[id]:before, a[name]:before {
+h2[id]:before {
display: block;
content: "";
- height: 120px;
- margin: -120px 0 0;
+ height: 360px;
+ margin: -360px 0 0;
+}
+
+/* Set where the focus will be set when using anchor links */
+h3[id]:before, h4[id]:before, h5[id]:before, h6[id]:before, a[name]:before {
+ display: block;
+ content: "";
+ height: 106px;
+ margin: -106px 0 0;
}
/* Re-Format the position of the "to top" link */
diff --git a/src/site/resources/img/PLC4X_rollup_83x237cm-final.pdf
b/src/site/resources/images/PLC4X_rollup_83x237cm-final.pdf
similarity index 100%
rename from src/site/resources/img/PLC4X_rollup_83x237cm-final.pdf
rename to src/site/resources/images/PLC4X_rollup_83x237cm-final.pdf
diff --git a/src/site/resources/img/apache_brooklyn_logo.png
b/src/site/resources/images/apache_brooklyn_logo.png
similarity index 100%
rename from src/site/resources/img/apache_brooklyn_logo.png
rename to src/site/resources/images/apache_brooklyn_logo.png
diff --git a/src/site/resources/img/apache_camel_logo.png
b/src/site/resources/images/apache_camel_logo.png
similarity index 100%
rename from src/site/resources/img/apache_camel_logo.png
rename to src/site/resources/images/apache_camel_logo.png
diff --git a/src/site/resources/img/apache_edgent_logo.png
b/src/site/resources/images/apache_edgent_logo.png
similarity index 100%
rename from src/site/resources/img/apache_edgent_logo.png
rename to src/site/resources/images/apache_edgent_logo.png
diff --git a/src/site/resources/img/apache_kafka_logo.png
b/src/site/resources/images/apache_kafka_logo.png
similarity index 100%
rename from src/site/resources/img/apache_kafka_logo.png
rename to src/site/resources/images/apache_kafka_logo.png
diff --git a/src/site/resources/img/apache_mynewt_logo.png
b/src/site/resources/images/apache_mynewt_logo.png
similarity index 100%
rename from src/site/resources/img/apache_mynewt_logo.png
rename to src/site/resources/images/apache_mynewt_logo.png
diff --git a/src/site/resources/img/apache_nifi_logo.svg
b/src/site/resources/images/apache_nifi_logo.svg
similarity index 100%
rename from src/site/resources/img/apache_nifi_logo.svg
rename to src/site/resources/images/apache_nifi_logo.svg
diff --git a/src/site/resources/img/apache_plc4x_logo.png
b/src/site/resources/images/apache_plc4x_logo.png
similarity index 100%
rename from src/site/resources/img/apache_plc4x_logo.png
rename to src/site/resources/images/apache_plc4x_logo.png
diff --git a/src/site/resources/img/community-contribute-fork.png
b/src/site/resources/images/community-contribute-fork.png
similarity index 100%
rename from src/site/resources/img/community-contribute-fork.png
rename to src/site/resources/images/community-contribute-fork.png
diff --git a/src/site/resources/img/iot-lab.jpg
b/src/site/resources/images/iot-lab.jpg
similarity index 100%
rename from src/site/resources/img/iot-lab.jpg
rename to src/site/resources/images/iot-lab.jpg
diff --git
a/src/site/resources/img/neo4j-intellij-database-connections-view.png
b/src/site/resources/images/neo4j-intellij-database-connections-view.png
similarity index 100%
rename from src/site/resources/img/neo4j-intellij-database-connections-view.png
rename to src/site/resources/images/neo4j-intellij-database-connections-view.png
diff --git a/src/site/resources/img/neo4j-intellij-query-results.png
b/src/site/resources/images/neo4j-intellij-query-results.png
similarity index 100%
rename from src/site/resources/img/neo4j-intellij-query-results.png
rename to src/site/resources/images/neo4j-intellij-query-results.png
diff --git a/src/site/resources/img/neo4j-intellij-settings.png
b/src/site/resources/images/neo4j-intellij-settings.png
similarity index 100%
rename from src/site/resources/img/neo4j-intellij-settings.png
rename to src/site/resources/images/neo4j-intellij-settings.png
diff --git a/src/site/resources/img/neo4j-web-console.png
b/src/site/resources/images/neo4j-web-console.png
similarity index 100%
rename from src/site/resources/img/neo4j-web-console.png
rename to src/site/resources/images/neo4j-web-console.png
diff --git a/src/site/resources/img/plc4x-vpn-beckhoff-route-1.png
b/src/site/resources/images/plc4x-vpn-beckhoff-route-1.png
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-beckhoff-route-1.png
rename to src/site/resources/images/plc4x-vpn-beckhoff-route-1.png
diff --git a/src/site/resources/img/plc4x-vpn-beckhoff-route-2.png
b/src/site/resources/images/plc4x-vpn-beckhoff-route-2.png
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-beckhoff-route-2.png
rename to src/site/resources/images/plc4x-vpn-beckhoff-route-2.png
diff --git a/src/site/resources/img/plc4x-vpn-beckhoff-route-3.png
b/src/site/resources/images/plc4x-vpn-beckhoff-route-3.png
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-beckhoff-route-3.png
rename to src/site/resources/images/plc4x-vpn-beckhoff-route-3.png
diff --git a/src/site/resources/img/plc4x-vpn-beckhoff.jpg
b/src/site/resources/images/plc4x-vpn-beckhoff.jpg
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-beckhoff.jpg
rename to src/site/resources/images/plc4x-vpn-beckhoff.jpg
diff --git a/src/site/resources/img/plc4x-vpn-client-download.png
b/src/site/resources/images/plc4x-vpn-client-download.png
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-client-download.png
rename to src/site/resources/images/plc4x-vpn-client-download.png
diff --git a/src/site/resources/img/plc4x-vpn-fatek.jpg
b/src/site/resources/images/plc4x-vpn-fatek.jpg
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-fatek.jpg
rename to src/site/resources/images/plc4x-vpn-fatek.jpg
diff --git a/src/site/resources/img/plc4x-vpn-siemens-hmi.jpg
b/src/site/resources/images/plc4x-vpn-siemens-hmi.jpg
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-siemens-hmi.jpg
rename to src/site/resources/images/plc4x-vpn-siemens-hmi.jpg
diff --git a/src/site/resources/img/plc4x-vpn-siemens-s7.jpg
b/src/site/resources/images/plc4x-vpn-siemens-s7.jpg
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-siemens-s7.jpg
rename to src/site/resources/images/plc4x-vpn-siemens-s7.jpg
diff --git a/src/site/resources/img/plc4x-vpn-wago.jpg
b/src/site/resources/images/plc4x-vpn-wago.jpg
similarity index 100%
rename from src/site/resources/img/plc4x-vpn-wago.jpg
rename to src/site/resources/images/plc4x-vpn-wago.jpg
diff --git
a/src/site/resources/img/release-git-diff-next-development-iteration.png
b/src/site/resources/images/release-git-diff-next-development-iteration.png
similarity index 100%
rename from
src/site/resources/img/release-git-diff-next-development-iteration.png
rename to
src/site/resources/images/release-git-diff-next-development-iteration.png
diff --git a/src/site/resources/img/release-git-diff-prepare-release.png
b/src/site/resources/images/release-git-diff-prepare-release.png
similarity index 100%
rename from src/site/resources/img/release-git-diff-prepare-release.png
rename to src/site/resources/images/release-git-diff-prepare-release.png
diff --git a/src/site/resources/img/release-git-history.png
b/src/site/resources/images/release-git-history.png
similarity index 100%
rename from src/site/resources/img/release-git-history.png
rename to src/site/resources/images/release-git-history.png
diff --git a/src/site/site.xml b/src/site/site.xml
index e57e2f0..296e862 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,7 @@
<skin>
<groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-maven-skin</artifactId>
- <version>1.5.0</version>
+ <version>${reflow.skin.version}</version>
</skin>
<!-- Hide the publish date as this will cause changes on every generated
page every day -->
@@ -37,6 +37,7 @@
<custom>
<reflowSkin>
<localResources>true</localResources>
+ <absoluteResourceURL>https://plc4x.apache.org/</absoluteResourceURL>
<titleTemplate>Apache PLC4X� (Incubating) - %2$s</titleTemplate>
<slogan position="bannerLeft">The industrial IoT adapter</slogan>
<showApacheEvents>true</showApacheEvents>
@@ -69,12 +70,12 @@
</custom>
<poweredBy>
- <logo name="Apache Software Foundation"
img="https://www.apache.org/img/asf_logo.png"; href="https://www.apache.org/"/>
+ <logo name="Apache Software Foundation"
img="https://www.apache.org/images/asf_logo.png";
href="https://www.apache.org/"/>
</poweredBy>
<bannerLeft>
<name>Apache PLC4X (incubating)</name>
- <src>https://plc4x.apache.org/img/apache_plc4x_logo.png</src>
+ <src>https://plc4x.apache.org/images/apache_plc4x_logo.png</src>
<href>https://plc4x.apache.org/</href>
</bannerLeft>
![https://www.apache.org/img/asf_logo.png"](https://www.apache.org/img/asf_logo.png"){kind=link}
![https://www.apache.org/images/asf_logo.png"](https://www.apache.org/images/asf_logo.png"){kind=link}
