Skip to content

Commit e0e0b6f

Browse files
authored
Merge pull request #210 from apache/Feature/Antora
Migrate log4net site to Antora and use logging-parent pom
2 parents d26eae0 + d23d74d commit e0e0b6f

File tree

141 files changed

+7044
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+7044
-281
lines changed

.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,4 +205,10 @@ dotnet_diagnostic.KR1037.severity = none
205205
# NUnit2045: Use Assert.Multiple
206206
dotnet_diagnostic.NUnit2045.severity = none
207207
# IDE0079: Remove unnecessary suppressions
208-
dotnet_diagnostic.IDE0079.severity = none
208+
dotnet_diagnostic.IDE0079.severity = none
209+
210+
[*.xml]
211+
tab_width = 2
212+
indent_size = 2
213+
indent_style = space
214+
end_of_line = crlf

.github/workflows/git-broadcast.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to you under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
name: Broadcast master updates to satellites
218

319
on:

.gitignore

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ ipch/
8787
*.vspx
8888
*.sap
8989

90-
# TFS 2012 Local Workspace
91-
$tf/
92-
9390
# Guidance Automation Toolkit
9491
*.gpState
9592

@@ -169,18 +166,6 @@ AppPackages/
169166
# but keep track of directories ending in .cache
170167
!*.[Cc]ache/
171168

172-
# Others
173-
ClientBin/
174-
[Ss]tyle[Cc]op.*
175-
~$*
176-
*~
177-
*.dbmdl
178-
*.dbproj.schemaview
179-
*.pfx
180-
*.publishsettings
181-
node_modules/
182-
orleans.codegen.cs
183-
184169
# RIA/Silverlight projects
185170
Generated_Code/
186171

@@ -240,11 +225,15 @@ src/GeneratedAssemblyInfo.cs
240225
*.orig
241226
*.old
242227
*.swp
228+
node
229+
node_modules
243230
build-tools
244231
buildreports
245232
vs_buildtools.exe
246233
dotnetfx35.exe
247234
*.exe
248235
/src/Binaries/*
249236

250-
local-tasks/*.generated.js
237+
local-tasks/*.generated.js
238+
/.flattened-pom.xml
239+
validate

.mvn/jvm.config

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-Djava.awt.headless=true
2+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
6+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
7+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
8+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
9+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
10+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
11+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
12+
--add-opens java.base/sun.nio.ch=ALL-UNNAMED
13+
--add-opens java.base/java.io=ALL-UNNAMED

.mvn/wrapper/maven-wrapper.jar

61.1 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

antora-playbook.yaml

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to you under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
site:
19+
title: Apache log4net
20+
url: "https://logging.apache.org/log4net"
21+
start_page: "ROOT::index.adoc"
22+
23+
content:
24+
sources:
25+
- url: .
26+
branches: HEAD
27+
start_paths:
28+
- target/generated-site/antora
29+
edit_url:
30+
31+
runtime:
32+
log:
33+
# Fail on warnings
34+
failure_level: warn
35+
36+
asciidoc:
37+
extensions:
38+
- "@asciidoctor/tabs"
39+
40+
ui:
41+
42+
bundle:
43+
url: "https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable"
44+
snapshot: true
45+
46+
# Template files: https://github.com/asciidoctor/asciidoctor-docs-ui/blob/main/src
47+
# Template variables: https://docs.antora.org/antora-ui-default/templates
48+
supplemental_files:
49+
50+
# Add `@asciidoctor/tabs` extension styles
51+
- path: css/vendor/tabs.css
52+
contents: ./node_modules/@asciidoctor/tabs/dist/css/tabs.css
53+
54+
# Add `@asciidoctor/tabs` extension scripts
55+
- path: js/vendor/tabs.js
56+
contents: ./node_modules/@asciidoctor/tabs/dist/js/tabs.js
57+
58+
- path: partials/footer-scripts.hbs
59+
contents: |
60+
<script id="site-script" src="{{{uiRootPath}}}/js/site.js" data-ui-root-path="{{{uiRootPath}}}"></script>
61+
<script async src="{{{uiRootPath}}}/js/vendor/highlight.js"></script>
62+
<!-- `@asciidoctor/tabs` extension scripts -->
63+
<script async src="{{{uiRootPath}}}/js/vendor/tabs.js"></script>
64+
{{#if env.SITE_SEARCH_PROVIDER}}
65+
{{> search-scripts}}
66+
{{/if}}
67+
68+
- path: partials/head-styles.hbs
69+
contents: |
70+
<link rel="stylesheet" href="{{{uiRootPath}}}/css/site.css">
71+
<link rel="icon" href="{{{uiRootPath}}}/../_images/favicon.ico" type="image/x-icon">
72+
<!-- `@asciidoctor/tabs` extension styles -->
73+
<link rel="stylesheet" href="{{{uiRootPath}}}/css/vendor/tabs.css">
74+
<style>
75+
/* Swap colors of `IMPORTANT` and `WARNING` blocks */
76+
.doc .admonitionblock.important .icon { background-color: #f70; }
77+
.doc .admonitionblock.warning .icon { background-color: #e40046; }
78+
/* Default `h4`, `h5`, and `h6` are smaller than the normal text, fix header font sizing: */
79+
.doc h1 { font-size: 1.9rem; }
80+
.doc h2 { font-size: 1.7rem; }
81+
.doc h3 { font-size: 1.5rem; font-weight: 400; }
82+
.doc h4 { font-size: 1.3rem; font-weight: 500; }
83+
.doc h5 { font-size: 1.1rem; font-weight: 500; text-decoration: underline; }
84+
.doc h6 { font-size: 0.9rem; font-weight: 500; text-decoration: underline; }
85+
/* Default `code`, `pre`, and `.colist` (source code annotations) fonts are too big, adjust them: */
86+
.doc .colist>table code, .doc p code, .doc thead code { font-size: 0.8em; }
87+
.doc pre { font-size: 0.7rem; }
88+
.doc .colist { font-size: 0.75rem; }
89+
/* Make links more visible: */
90+
.doc a { text-decoration: underline; }
91+
.doc a code { text-decoration: underline; color: #1565c0; }
92+
/* Tab header fonts aren't rendered good, adjusting the font weight: */
93+
.tablist > ul li { font-weight: 500; }
94+
/* `page-toclevels` greater than 4 are not supported by Antora UI, patching it: */
95+
.toc .toc-menu li[data-level="4"] a {
96+
padding-left: 2.75rem;
97+
}
98+
/* Replace the default highlight.js color for strings from red (unnecessarily signaling something negative) to green: */
99+
.hljs-string {
100+
color: #0f8532;
101+
}
102+
</style>
103+
104+
- path: partials/header-content.hbs
105+
contents: |
106+
<header class="header">
107+
<nav class="navbar">
108+
<div class="navbar-brand">
109+
<span class="navbar-item title">{{site.title}}</span>
110+
</div>
111+
<div id="topbar-nav" class="navbar-menu">
112+
<div class="navbar-end">
113+
<a class="navbar-item" href="https://logging.apache.org">a subproject of&nbsp;<strong>Apache Logging Services</strong></a>
114+
</div>
115+
</div>
116+
</nav>
117+
</header>
118+
119+
- path: partials/footer-content.hbs
120+
contents: |
121+
<footer class="footer">
122+
<p>
123+
Copyright © 1999-{{{year}}} <a href="https://www.apache.org/">The Apache Software Foundation</a>.
124+
Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a>.
125+
Please read our <a href="https://privacy.apache.org/policies/privacy-policy-public.html">privacy policy</a>.
126+
</p>
127+
<p>
128+
Apache, Log4j, and the Apache feather logo are trademarks or registered trademarks of The Apache Software Foundation.
129+
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
130+
Other names may be trademarks of their respective owners.
131+
</p>
132+
</footer>
133+
134+
# Disable component version selector
135+
- path: partials/nav-explore.hbs
136+
contents: ""
137+
138+
# Fix the `Edit this page` link
139+
- path: partials/edit-this-page.hbs
140+
contents: |
141+
<div class="edit-this-page"><a href="https://github.com/apache/logging-log4net/edit/Feature/Antora/src/site/antora/modules/{{page.module}}/pages/{{page.relativeSrcPath}}">Edit this Page</a></div>

0 commit comments

Comments
 (0)