You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/09/30 15:34:23 UTC
[1/2] sling-site git commit: also ignore IDE generated files (like
.project for Eclipse)
Repository: sling-site
Updated Branches:
refs/heads/master 78c0fcd83 -> 8b39fe9d6
also ignore IDE generated files (like .project for Eclipse)
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/ad265dcd
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/ad265dcd
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/ad265dcd
Branch: refs/heads/master
Commit: ad265dcdf6004706868fcf40ad45dd58dde7c16c
Parents: 60e5a88
Author: Konrad Windszus <kw...@apache.org>
Authored: Sat Sep 30 17:34:04 2017 +0200
Committer: Konrad Windszus <kw...@apache.org>
Committed: Sat Sep 30 17:34:04 2017 +0200
----------------------------------------------------------------------
.gitignore | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/ad265dcd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 12f9706..1a0836c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
output
cache
target
+# IDE settings
+.*
[2/2] sling-site git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/sling-site.git
Posted by kw...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/sling-site.git
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/8b39fe9d
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/8b39fe9d
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/8b39fe9d
Branch: refs/heads/master
Commit: 8b39fe9d632607ecef2d74d23ac481b9ca0b938c
Parents: ad265dc 78c0fcd
Author: Konrad Windszus <ko...@netcentric.biz>
Authored: Sat Sep 30 17:34:17 2017 +0200
Committer: Konrad Windszus <ko...@netcentric.biz>
Committed: Sat Sep 30 17:34:17 2017 +0200
----------------------------------------------------------------------
README.md | 30 ++++++++++---
src/main/jbake/assets/res/css/site.css | 23 ++++++++++
src/main/jbake/content/contributing.md | 1 +
src/main/jbake/content/documentation.md | 1 +
src/main/jbake/content/documentation/bundles.md | 1 +
...ilesystem-resources-extensions-fsresource.md | 1 +
.../bundles/apache-sling-commons-thread-pool.md | 1 +
.../apache-sling-eventing-and-job-handling.md | 1 +
...undle-resources-extensions-bundleresource.md | 1 +
.../documentation/bundles/caching-services.md | 1 +
.../bundles/commons-html-utilities.md | 1 +
.../bundles/configuration-installer-factory.md | 1 +
.../bundles/content-distribution.md | 1 +
.../content-loading-jcr-contentloader.md | 1 +
...ware-configuration-default-implementation.md | 1 +
.../context-aware-configuration-override.md | 1 +
.../context-aware-configuration-spi.md | 1 +
.../context-aware-configuration.md | 1 +
.../bundles/datasource-providers.md | 1 +
.../bundles/discovery-api-and-impl.md | 1 +
.../documentation/bundles/dynamic-includes.md | 1 +
.../bundles/file-installer-provider.md | 1 +
.../internationalization-support-i18n.md | 1 +
.../bundles/jcr-installer-provider.md | 1 +
.../documentation/bundles/log-tracers.md | 1 +
...ging-permissions-jackrabbit-accessmanager.md | 1 +
...g-users-and-groups-jackrabbit-usermanager.md | 1 +
...ontent-the-slingpostservlet-servlets-post.md | 1 +
.../content/documentation/bundles/metrics.md | 1 +
.../bundles/mime-type-support-commons-mime.md | 1 +
.../content/documentation/bundles/models.md | 1 +
.../bundles/nosql-resource-providers.md | 1 +
.../bundles/org-apache-sling-junit-bundles.md | 1 +
.../documentation/bundles/osgi-installer.md | 1 +
...iting-pipelines-org-apache-sling-rewriter.md | 1 +
.../rendering-content-default-get-servlets.md | 1 +
.../bundles/repository-initialization.md | 3 +-
.../documentation/bundles/request-analysis.md | 1 +
.../bundles/resource-access-security.md | 1 +
.../documentation/bundles/resource-editor.md | 1 +
.../documentation/bundles/resource-merger.md | 1 +
.../scheduler-service-commons-scheduler.md | 1 +
.../content/documentation/bundles/scripting.md | 1 +
.../bundles/scripting/scripting-htl.md | 1 +
.../bundles/scripting/scripting-jsp.md | 1 +
.../bundles/scripting/scripting-thymeleaf.md | 1 +
.../documentation/bundles/servlet-helpers.md | 1 +
.../bundles/sling-health-check-tool.md | 1 +
.../bundles/sling-oak-restrictions.md | 1 +
.../documentation/bundles/sling-pipes.md | 1 +
.../documentation/bundles/sling-query.md | 1 +
.../bundles/sling-query/basic-ideas.md | 1 +
.../bundles/sling-query/examples.md | 1 +
.../bundles/sling-query/hierarchy-operators.md | 1 +
.../bundles/sling-query/methods.md | 1 +
.../bundles/sling-query/modifiers.md | 1 +
.../bundles/sling-query/operators.md | 1 +
.../bundles/sling-query/selectors.md | 1 +
.../documentation/bundles/sling-query/vs-jcr.md | 1 +
.../sling-settings-org-apache-sling-settings.md | 1 +
.../bundles/subsystem-installer-factory.md | 1 +
.../content/documentation/bundles/validation.md | 1 +
.../bundles/web-console-extensions.md | 1 +
.../documentation/bundles/xml-support.md | 1 +
.../content/documentation/configuration.md | 1 +
.../jbake/content/documentation/development.md | 1 +
.../development/client-request-logging.md | 1 +
.../development/dependency-management.md | 1 +
.../development/embedding-sling.md | 1 +
.../development/getting-and-building-sling.md | 11 ++---
.../documentation/development/hamcrest.md | 1 +
.../development/htl-maven-plugin.md | 1 +
.../documentation/development/ide-tooling.md | 1 +
.../ide-tooling-incremental-build.md | 1 +
.../documentation/development/issue-tracker.md | 1 +
.../documentation/development/jcr-mock.md | 1 +
.../content/documentation/development/jspc.md | 1 +
.../documentation/development/jsr-305.md | 1 +
.../documentation/development/logging.md | 1 +
.../development/maven-archetypes.md | 1 +
.../development/maven-launchpad-plugin.md | 1 +
.../documentation/development/maven-usage.md | 1 +
.../development/maventipsandtricks.md | 1 +
.../development/monitoring-requests.md | 1 +
.../documentation/development/osgi-mock.md | 1 +
.../development/release-management.md | 1 +
.../development/repository-based-development.md | 1 +
.../development/resourceresolver-mock.md | 1 +
.../documentation/development/sling-mock.md | 1 +
.../development/sling-testing-tools.md | 1 +
.../content/documentation/development/sling.md | 1 +
.../documentation/development/slingstart.md | 1 +
.../documentation/development/version-policy.md | 1 +
.../content/documentation/getting-started.md | 34 +++++++++++++--
.../discover-sling-in-15-minutes.md | 1 +
.../content/documentation/legacy/logging.md | 1 +
.../content/documentation/pax-exam-utils.md | 1 +
.../content/documentation/the-sling-engine.md | 1 +
.../documentation/the-sling-engine/adapters.md | 1 +
.../the-sling-engine/architecture.md | 3 +-
.../the-sling-engine/authentication.md | 1 +
.../authentication/authentication-actors.md | 1 +
.../authentication-authenticationhandler.md | 1 +
.../form-based-authenticationhandler.md | 1 +
.../openid-authenticationhandler.md | 1 +
.../authentication/authentication-framework.md | 1 +
.../authentication/authentication-tasks.md | 1 +
.../default-mapping-and-rendering.md | 1 +
.../the-sling-engine/dispatching-requests.md | 1 +
.../the-sling-engine/errorhandling.md | 1 +
.../the-sling-engine/featureflags.md | 1 +
.../documentation/the-sling-engine/filters.md | 1 +
.../mappings-for-resource-resolution.md | 1 +
.../the-sling-engine/request-listeners.md | 1 +
.../the-sling-engine/request-parameters.md | 1 +
.../documentation/the-sling-engine/resources.md | 1 +
.../the-sling-engine/service-authentication.md | 1 +
.../documentation/the-sling-engine/servlets.md | 1 +
.../the-sling-engine/sling-api-crud-support.md | 1 +
.../the-sling-engine/sling-properties.md | 1 +
.../the-sling-engine/the-sling-launchpad.md | 1 +
.../the-sling-engine/url-decomposition.md | 1 +
.../url-to-script-resolution.md | 1 +
.../wrap-or-decorate-resources.md | 1 +
.../content/documentation/tutorials-how-tos.md | 1 +
.../tutorials-how-tos/46-line-blog.md | 1 +
...getting-resources-and-properties-in-sling.md | 1 +
.../how-to-manage-events-in-sling.md | 1 +
.../installing-and-upgrading-bundles.md | 1 +
.../tutorials-how-tos/jackrabbit-persistence.md | 1 +
.../testing-sling-based-applications.md | 1 +
src/main/jbake/content/downloads.md | 1 +
src/main/jbake/content/guides.md | 1 +
src/main/jbake/content/index.md | 46 ++++++++++----------
src/main/jbake/content/javadoc-io.md | 1 +
src/main/jbake/content/links.md | 1 +
src/main/jbake/content/media.md | 1 +
src/main/jbake/content/news.md | 1 +
.../news/sling-ide-tooling-11-released.md | 1 +
.../content/news/sling-launchpad-8-released.md | 1 +
.../content/news/sling-launchpad-9-released.md | 1 +
src/main/jbake/content/old-stuff.md | 1 +
src/main/jbake/content/old-stuff/assembly.md | 1 +
.../jbake/content/old-stuff/launch-sling.md | 1 +
.../content/old-stuff/request-processing.md | 1 +
.../run-modes-org-apache-sling-runmode.md | 1 +
.../old-stuff/scriptengineintegration.md | 1 +
.../scriptengineintegration/groovy-support.md | 1 +
.../xslt-processing-pipeline.md | 1 +
.../content/old-stuff/servlet-resolution.md | 1 +
src/main/jbake/content/old-stuff/sling-api.md | 1 +
src/main/jbake/content/project-information.md | 1 +
...pache-sling-community-roles-and-processes.md | 1 +
.../project-information/project-license.md | 1 +
.../content/project-information/project-team.md | 1 +
.../content/project-information/security.md | 1 +
src/main/jbake/content/site-conversion.md | 1 +
src/main/jbake/templates/downloads.tpl | 1 +
src/main/jbake/templates/layout/main.tpl | 7 ++-
src/main/jbake/templates/page.tpl | 12 +++++
src/main/jbake/templates/tags.tpl | 44 ++++++++++++++++++-
161 files changed, 321 insertions(+), 43 deletions(-)
----------------------------------------------------------------------