You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2021/07/20 00:16:17 UTC
[felix-antora] branch main updated (5eaf5db -> f5193df)
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/felix-antora.git.
from 5eaf5db use correct name for ui bundle package
new aae2760 update current redirects to reflect moved pages
new f5193df (commented out) local build, playbook tweaks
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
antora-playbook-htaccess-edit.yml | 6 +--
antora-playbook.yml | 5 ++
dot-htaccess-current | 102 --------------------------------------
3 files changed, 8 insertions(+), 105 deletions(-)
[felix-antora] 01/02: update current redirects to reflect moved
pages
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/felix-antora.git
commit aae2760f27311e4d1248a050154bdd8c32c022dd
Author: David Jencks <dj...@apache.org>
AuthorDate: Mon Jul 19 17:13:22 2021 -0700
update current redirects to reflect moved pages
---
dot-htaccess-current | 102 ---------------------------------------------------
1 file changed, 102 deletions(-)
diff --git a/dot-htaccess-current b/dot-htaccess-current
index bce2073..e69de29 100644
--- a/dot-htaccess-current
+++ b/dot-htaccess-current
@@ -1,102 +0,0 @@
-Redirect 301 /documentation/community.html /documentation/documentation/community.html
-Redirect 301 /documentation/community/contributing.html /documentation/documentation/community/contributing.html
-Redirect 301 /documentation/community/project-info.html /documentation/documentation/community/project-info.html
-Redirect 301 /documentation/community/projects-using-felix.html /documentation/documentation/community/projects-using-felix.html
-Redirect 301 /documentation/development.html /documentation/documentation/development.html
-Redirect 301 /documentation/development/coding-standards.html /documentation/documentation/development/coding-standards.html
-Redirect 301 /documentation/development/dependencies-file-template.html /documentation/documentation/development/dependencies-file-template.html
-Redirect 301 /documentation/development/provisional-osgi-api-policy.html /documentation/documentation/development/provisional-osgi-api-policy.html
-Redirect 301 /documentation/development/release-management-nexus.html /documentation/documentation/development/release-management-nexus.html
-Redirect 301 /documentation/development/site-how-to.html /documentation/documentation/development/site-how-to.html
-Redirect 301 /documentation/development/using-the-osgi-compliance-tests.html /documentation/documentation/development/using-the-osgi-compliance-tests.html
-Redirect 301 /documentation/faqs.html /documentation/documentation/faqs.html
-Redirect 301 /documentation/faqs/apache-felix-bundle-plugin-faq.html /documentation/documentation/faqs/apache-felix-bundle-plugin-faq.html
-Redirect 301 /documentation/faqs/apache-felix-scr-plugin-faq.html /documentation/documentation/faqs/apache-felix-scr-plugin-faq.html
-Redirect 301 /documentation/getting-started.html /documentation/documentation/getting-started.html
-Redirect 301 /documentation/subprojects.html /documentation/documentation/subprojects.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager.html /documentation/documentation/subprojects/apache-felix-dependency-manager.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/annotations.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/background.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/background.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/development.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/development.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/history.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/history.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/resources.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/resources.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.html /documentation/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/components.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/external-links.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/service-scopes.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/service-scopes.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.html /documentation/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.html /documentation/documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.html /documentation/documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.html /documentation/documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.html
-Redirect 301 /documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.html /documentation/documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.html
-Redirect 301 /documentation/subprojects/apache-felix-event-admin.html /documentation/documentation/subprojects/apache-felix-event-admin.html
-Redirect 301 /documentation/subprojects/apache-felix-file-install.html /documentation/documentation/subprojects/apache-felix-file-install.html
-Redirect 301 /documentation/subprojects/apache-felix-framework-security.html /documentation/documentation/subprojects/apache-felix-framework-security.html
-Redirect 301 /documentation/subprojects/apache-felix-framework.html /documentation/documentation/subprojects/apache-felix-framework.html
-Redirect 301 /documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.html /documentation/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.html
-Redirect 301 /documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html /documentation/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.html
-Redirect 301 /documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html /documentation/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.html
-Redirect 301 /documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.html /documentation/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.html
-Redirect 301 /documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.html /documentation/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.html
-Redirect 301 /documentation/subprojects/apache-felix-gogo.html /documentation/documentation/subprojects/apache-felix-gogo.html
-Redirect 301 /documentation/subprojects/apache-felix-gogo/rfc-147-overview.html /documentation/documentation/subprojects/apache-felix-gogo/rfc-147-overview.html
-Redirect 301 /documentation/subprojects/apache-felix-healthchecks.html /documentation/documentation/subprojects/apache-felix-healthchecks.html
-Redirect 301 /documentation/subprojects/apache-felix-inventory.html /documentation/documentation/subprojects/apache-felix-inventory.html
-Redirect 301 /documentation/subprojects/apache-felix-log.html /documentation/documentation/subprojects/apache-felix-log.html
-Redirect 301 /documentation/subprojects/apache-felix-logback.html /documentation/documentation/subprojects/apache-felix-logback.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html /documentation/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.html /documentation/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.html /documentation/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html /documentation/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.html /documentation/documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html /documentation/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html
-Redirect 301 /documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.html /documentation/documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.html
-Redirect 301 /documentation/subprojects/apache-felix-metatype-service.html /documentation/documentation/subprojects/apache-felix-metatype-service.html
-Redirect 301 /documentation/subprojects/apache-felix-osgi-bundle-repository.html /documentation/documentation/subprojects/apache-felix-osgi-bundle-repository.html
-Redirect 301 /documentation/subprojects/apache-felix-preferences-service.html /documentation/documentation/subprojects/apache-felix-preferences-service.html
-Redirect 301 /documentation/subprojects/apache-felix-remote-shell.html /documentation/documentation/subprojects/apache-felix-remote-shell.html
-Redirect 301 /documentation/subprojects/apache-felix-shell-tui.html /documentation/documentation/subprojects/apache-felix-shell-tui.html
-Redirect 301 /documentation/subprojects/apache-felix-shell.html /documentation/documentation/subprojects/apache-felix-shell.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console.html /documentation/documentation/subprojects/apache-felix-web-console.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.html /documentation/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.html /documentation/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.html /documentation/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.html /documentation/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.html /documentation/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.html /documentation/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/web-console-restful-api.html /documentation/documentation/subprojects/apache-felix-web-console/web-console-restful-api.html
-Redirect 301 /documentation/subprojects/apache-felix-web-console/web-console-security-provider.html /documentation/documentation/subprojects/apache-felix-web-console/web-console-security-provider.html
-Redirect 301 /documentation/tutorials-examples-and-presentations.html /documentation/documentation/tutorials-examples-and-presentations.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.html
-Redirect 301 /documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.html /documentation/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.html
\ No newline at end of file
[felix-antora] 02/02: (commented out) local build, playbook tweaks
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/felix-antora.git
commit f5193dfc338c9da6c5c470cbfa2d1aa4b0d188f6
Author: David Jencks <dj...@apache.org>
AuthorDate: Mon Jul 19 17:15:50 2021 -0700
(commented out) local build, playbook tweaks
---
antora-playbook-htaccess-edit.yml | 6 +++---
antora-playbook.yml | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/antora-playbook-htaccess-edit.yml b/antora-playbook-htaccess-edit.yml
index 859d4ce..3df00b9 100644
--- a/antora-playbook-htaccess-edit.yml
+++ b/antora-playbook-htaccess-edit.yml
@@ -3,13 +3,13 @@ site:
start_page: documentation::index.adoc
content:
sources:
-# For local "author mode" builds check out this aries-antora playbook project
+# For local "author mode" builds check out this felix-antora playbook project
# and the site project next to one another and uncomment the next two lines and comment out the other - url
- url: ./../felix-site
branches: HEAD
# For "production" build without needing a local site checkout uncomment the next two lines and comment out the previous two.
-# - url: https://github.com/djencks/aries-antora-site.git
-# branches: master
+# - url: https://github.com/apache/felix-antora-site.git
+# branches: main
asciidoc:
extensions:
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 05fc465..e51dc8b 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -5,6 +5,11 @@ site:
content:
sources:
+ # For local "author mode" builds check out this felix-antora playbook project
+ # and the site project next to one another and uncomment the next two lines and comment out the other - url
+# - url: ./../felix-site
+# branches: HEAD
+ # For "production" build without needing a local site checkout uncomment the next two lines and comment out the previous two.
- url: https://github.com/apache/felix-antora-site.git
branches: main
# - url: ./../felix-dev