You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/01/17 09:28:35 UTC
[incubator-plc4x] branch master updated: - Some cleaning up in the
site and the site-menu - Added some initial pages for important content
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push:
new 1e589ea - Some cleaning up in the site and the site-menu - Added some initial pages for important content
1e589ea is described below
commit 1e589eaa88c09bf894a4a7e66d029f5de770f55c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jan 17 10:28:31 2018 +0100
- Some cleaning up in the site and the site-menu
- Added some initial pages for important content
---
.../{development => developers}/building.adoc | 2 +-
.../asciidoc/{development => developers}/ci.adoc | 9 +++++++++
.../{development => developers}/contributing.adoc | 0
.../ci.adoc => developers/issues.adoc} | 3 ++-
.../{development/ci.adoc => developers/sonar.adoc} | 3 ++-
.../{development => developers}/website.adoc | 0
.../{development/ci.adoc => developers/wiki.adoc} | 3 ++-
.../ci.adoc => users/gettingstarted.adoc} | 4 +++-
.../{development/ci.adoc => users/industry40.adoc} | 4 +++-
src/site/site.xml | 23 +++++++++++-----------
10 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/site/asciidoc/development/building.adoc b/src/site/asciidoc/developers/building.adoc
similarity index 98%
rename from src/site/asciidoc/development/building.adoc
rename to src/site/asciidoc/developers/building.adoc
index 77a2a31..6e5276d 100644
--- a/src/site/asciidoc/development/building.adoc
+++ b/src/site/asciidoc/developers/building.adoc
@@ -82,7 +82,7 @@ This will generate an additional `target/staging` directory which contains the f
A lot of documentation on Maven suggests to use the `site:site` goal directly instead of calling the `site` phase, but in case of PLC4X there is more than just the site generation that has to be executed.
-This is just a quick-start version of the site generation, for a fully detailed documentation please read the http://plc4x.apache.org/development/website.html[Website] documentation page.
+This is just a quick-start version of the site generation, for a fully detailed documentation please read the http://plc4x.apache.org/developers/website.html[Website] documentation page.
=== Some special Maven profiles
diff --git a/src/site/asciidoc/development/ci.adoc b/src/site/asciidoc/developers/ci.adoc
similarity index 62%
copy from src/site/asciidoc/development/ci.adoc
copy to src/site/asciidoc/developers/ci.adoc
index 33ba8ba..4d01a95 100644
--- a/src/site/asciidoc/development/ci.adoc
+++ b/src/site/asciidoc/developers/ci.adoc
@@ -17,3 +17,12 @@
== Continuous Integration
+We are currently using two different CI systems.
+
+- Apache's Jenkins at: https://builds.apache.org/view/P/view/PLC4X/
+- Travis at: https://travis-ci.org/apache/incubator-plc4x/
+
+Hereby Apache Jenkins clearly is responsible for running the full testsuite with all integration-tests.
+Also only jobs on Apache Jenkins are allowed to publish SNAPSHOT versions of the Maven artifacts to Apaches Nexus.
+
+Travis integrates perfectly into GitHub. We are using this to auto-check any pull-requests coming in.
diff --git a/src/site/asciidoc/development/contributing.adoc b/src/site/asciidoc/developers/contributing.adoc
similarity index 100%
rename from src/site/asciidoc/development/contributing.adoc
rename to src/site/asciidoc/developers/contributing.adoc
diff --git a/src/site/asciidoc/development/ci.adoc b/src/site/asciidoc/developers/issues.adoc
similarity index 92%
copy from src/site/asciidoc/development/ci.adoc
copy to src/site/asciidoc/developers/issues.adoc
index 33ba8ba..f813330 100644
--- a/src/site/asciidoc/development/ci.adoc
+++ b/src/site/asciidoc/developers/issues.adoc
@@ -15,5 +15,6 @@
// limitations under the License.
//
-== Continuous Integration
+== Bug & Issue Tracker
+https://issues.apache.org/jira/projects/PLC4X
\ No newline at end of file
diff --git a/src/site/asciidoc/development/ci.adoc b/src/site/asciidoc/developers/sonar.adoc
similarity index 92%
copy from src/site/asciidoc/development/ci.adoc
copy to src/site/asciidoc/developers/sonar.adoc
index 33ba8ba..a84eed4 100644
--- a/src/site/asciidoc/development/ci.adoc
+++ b/src/site/asciidoc/developers/sonar.adoc
@@ -15,5 +15,6 @@
// limitations under the License.
//
-== Continuous Integration
+== Code Analysis
+https://builds.apache.org/analysis/overview?id=55410
\ No newline at end of file
diff --git a/src/site/asciidoc/development/website.adoc b/src/site/asciidoc/developers/website.adoc
similarity index 100%
rename from src/site/asciidoc/development/website.adoc
rename to src/site/asciidoc/developers/website.adoc
diff --git a/src/site/asciidoc/development/ci.adoc b/src/site/asciidoc/developers/wiki.adoc
similarity index 93%
copy from src/site/asciidoc/development/ci.adoc
copy to src/site/asciidoc/developers/wiki.adoc
index 33ba8ba..3e6d859 100644
--- a/src/site/asciidoc/development/ci.adoc
+++ b/src/site/asciidoc/developers/wiki.adoc
@@ -15,5 +15,6 @@
// limitations under the License.
//
-== Continuous Integration
+== WIKI
+https://cwiki.apache.org/confluence/display/PLC4X
\ No newline at end of file
diff --git a/src/site/asciidoc/development/ci.adoc b/src/site/asciidoc/users/gettingstarted.adoc
similarity index 96%
copy from src/site/asciidoc/development/ci.adoc
copy to src/site/asciidoc/users/gettingstarted.adoc
index 33ba8ba..c975484 100644
--- a/src/site/asciidoc/development/ci.adoc
+++ b/src/site/asciidoc/users/gettingstarted.adoc
@@ -15,5 +15,7 @@
// limitations under the License.
//
-== Continuous Integration
+== Getting Started
+
+
diff --git a/src/site/asciidoc/development/ci.adoc b/src/site/asciidoc/users/industry40.adoc
similarity index 96%
rename from src/site/asciidoc/development/ci.adoc
rename to src/site/asciidoc/users/industry40.adoc
index 33ba8ba..1c2759c 100644
--- a/src/site/asciidoc/development/ci.adoc
+++ b/src/site/asciidoc/users/industry40.adoc
@@ -15,5 +15,7 @@
// limitations under the License.
//
-== Continuous Integration
+== Industry 4.0 Toolbox
+
+
diff --git a/src/site/site.xml b/src/site/site.xml
index 0f42b1a..f1da0c8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -82,19 +82,19 @@
<link rel="stylesheet" href="$resourcePath/css/font-awesome.min.css"/>
</head>
- <menu ref="reports" inherit="top"/>
<menu ref="parent" inherit="top"/>
- <menu name="Development">
- <item name="Building" href="development/building.html"/>
- <item name="Continuous Integration" href="development/ci.adoc"/>
- <item name="Contributing" href="development/contributing.adoc"/>
- <item name="Website" href="development/website.html"/>
+ <menu name="Users">
+ <item name="Getting Started" href="users/gettingstarted.html"/>
+ <item name="Industry 4.0 Toolbox" href="users/industry40.html"/>
</menu>
- <menu name="Infrastructure">
- <item name="Wiki" href="https://cwiki.apache.org/confluence/display/PLC4X"/>
- <item name="Issues" href="https://issues.apache.org/jira/projects/PLC4X"/>
- <item name="CI" href="https://builds.apache.org/view/P/view/PLC4X/"/>
- <item name="SonarQube" href="https://builds.apache.org/analysis/overview?id=55410"/>
+ <menu name="Developers">
+ <item name="Bug & Issue Tracker" href="developers/issues.html"/>
+ <item name="Building PLC4X" href="developers/building.html"/>
+ <item name="Code Analysis" href="developers/sonar.html"/>
+ <item name="Continuous Integration" href="developers/ci.html"/>
+ <item name="Contributing" href="developers/contributing.html"/>
+ <item name="Website" href="developers/website.html"/>
+ <item name="Wiki" href="developers/wiki.html"/>
</menu>
<menu name="Protocols">
<item name="Features" href="protocols/features.html"/>
@@ -102,6 +102,7 @@
<item name="OPC-UA" href="protocols/opc-ua/index.html"/>
<item name="S7/Profinet" href="protocols/s7/index.html"/>
</menu>
+ <menu name="Reports" ref="reports" inherit="top"/>
<menu ref="modules" inherit="top"/>
</body>
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].