You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/07/31 18:04:26 UTC
[1/2] isis git commit: ISIS-1082: tiny update to docs re:
externalizing configuration using Tomcat.
Repository: isis
Updated Branches:
refs/heads/master 59c3b4942 -> 2292306cd
ISIS-1082: tiny update to docs re: externalizing configuration using Tomcat.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4dbceb05
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4dbceb05
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4dbceb05
Branch: refs/heads/master
Commit: 4dbceb0540bb6f1fdb34bd24d9cfa8673fdfa1ca
Parents: 59c3b49
Author: Jeroen van der Wal <je...@stromboli.it>
Authored: Fri Jul 31 17:48:13 2015 +0200
Committer: Jeroen van der Wal <je...@stromboli.it>
Committed: Fri Jul 31 17:48:13 2015 +0200
----------------------------------------------------------------------
.../guides/_ug_deployment_externalized-configuration.adoc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4dbceb05/adocs/documentation/src/main/asciidoc/guides/_ug_deployment_externalized-configuration.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_deployment_externalized-configuration.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_deployment_externalized-configuration.adoc
index 8323391..811914b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ug_deployment_externalized-configuration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ug_deployment_externalized-configuration.adoc
@@ -56,9 +56,15 @@ For example, if using Tomcat 7.0, you would typically copy the empty `$TOMCAT_HO
----
<Parameter name="isis.config.dir"
value="/usr/local/tomcat/myapp/conf/"
- override="true"/>
+ override="false"/>
----
+[IMPORTANT]
+====
+Note that the `override` key should be set to "false"; not "true"; it indicates whether this parameter is overridable by the application's own `web.xml`. In most cases, you probably want to disallow that.
+====
+
+
For more detail, see the Tomcat documentation on http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Defining_a_context[defining a context] and on http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters[context parameters].
[NOTE]
[2/2] isis git commit: ISIS-1082: fixing name in more-thanks
Posted by da...@apache.org.
ISIS-1082: fixing name in more-thanks
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2292306c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2292306c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2292306c
Branch: refs/heads/master
Commit: 2292306cda3b6737da199c0346c4e8c30bb539b3
Parents: 4dbceb0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 31 17:03:42 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 31 17:03:42 2015 +0100
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/more-thanks.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2292306c/adocs/documentation/src/main/asciidoc/more-thanks.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/more-thanks.adoc b/adocs/documentation/src/main/asciidoc/more-thanks.adoc
index 6e92a5f..5df6464 100644
--- a/adocs/documentation/src/main/asciidoc/more-thanks.adoc
+++ b/adocs/documentation/src/main/asciidoc/more-thanks.adoc
@@ -38,7 +38,7 @@ Also to:
- link:https://github.com/mojavelinux[Dan Allen] for his fantastic work on link:https://github.com/asciidoctor/asciidoctor[Asciidoctor]
-- link:https://github.com/lukehutch[Luke Hutch] for his link:https://github.com/lukehutch/fast-classpath-scanner[fast-classpath-scanner], in particular for merging in our PR for Java 7 support and releasing so quickly
+- link:https://github.com/lukehutch[Luke Hutchison] for his link:https://github.com/lukehutch/fast-classpath-scanner[fast-classpath-scanner], in particular for merging in our PR for Java 7 support and releasing so quickly
- link:https://github.com/krasa/MavenHelper[Vojtech Krasa] for his super https://github.com/krasa/MavenHelper[MavenHelper] plugin to IntelliJ