You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2015/02/03 12:41:40 UTC
[09/17] incubator-brooklyn git commit: a few comments in addition to
#479
a few comments in addition to #479
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bd9b2925
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bd9b2925
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bd9b2925
Branch: refs/heads/master
Commit: bd9b29256207b22133fe6d2eda22b1da3f060027
Parents: 8f55a6e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jan 30 13:59:33 2015 +0000
Committer: Andrea Turli <an...@gmail.com>
Committed: Tue Feb 3 11:25:07 2015 +0100
----------------------------------------------------------------------
.../java/brooklyn/entity/proxy/nginx/NginxController.java | 1 -
.../entity/proxy/nginx/NginxTemplateConfigGenerator.java | 9 +++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd9b2925/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.java
index 1ca17df..d4a7315 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.java
@@ -37,7 +37,6 @@ import brooklyn.event.basic.Sensors;
import brooklyn.util.flags.SetFromFlag;
import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
/**
* An entity that represents an Nginx proxy (e.g. for routing requests to servers in a cluster).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd9b2925/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java
index faab7a9..aea735f 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxTemplateConfigGenerator.java
@@ -33,12 +33,17 @@ import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
/**
- * Processes a FreeMarker template to generate the {@code server.conf} configuration file for an {@link NginxController}.
+ * Processes a FreeMarker template to generate the {@code server.conf} configuration file for an
+ * {@link NginxController}.
+ * <p>
+ * Note this must be explicitly enabled via {@link NginxController#SERVER_CONF_GENERATOR}.
*/
public class NginxTemplateConfigGenerator implements NginxConfigFileGenerator {
public static final ConfigKey<String> SERVER_CONF_TEMPLATE_URL = ConfigKeys.newStringConfigKey(
- "nginx.config.templateUrl", "The server.conf configuration file URL (FreeMarker template)", "classpath://brooklyn/entity/proxy/nginx/server.conf");
+ "nginx.config.templateUrl", "The server.conf configuration file URL (FreeMarker template). "
+ + "Only applies if 'nginx.config.generator' specifies a generator which uses a template.",
+ "classpath://brooklyn/entity/proxy/nginx/server.conf");
public NginxTemplateConfigGenerator() { }