Author: kve
Date: Tue Sep 20 15:49:40 2011
New Revision: 1173204
URL: http://svn.apache.org/viewvc?rev=1173204&view=rev
Log:
Replaced firewall-rules-serviceA with firewall-rules.serviceA
See WHIRR-371
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java
whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java
whirr/trunk/src/site/xdoc/configuration-guide.xml
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java?rev=1173204&r1=1173203&r2=1173204&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java Tue Sep 20
15:49:40 2011
@@ -346,7 +346,7 @@ public class ClusterSpec {
Map<String, List<String>> fr = new HashMap<String, List<String>>();
String firewallPrefix = Property.FIREWALL_RULES.getConfigName();
- Pattern firewallRuleKeyPattern =
Pattern.compile("^".concat(Pattern.quote(firewallPrefix).concat("(?:-(.+))?$")));
+ Pattern firewallRuleKeyPattern =
Pattern.compile("^".concat(Pattern.quote(firewallPrefix).concat("(?:\\.(.+))?$")));
for (String key: Iterators.toArray(config.getKeys(), String.class)) {
Matcher m = firewallRuleKeyPattern.matcher(key);
if (!m.matches()) continue;
Modified: whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java?rev=1173204&r1=1173203&r2=1173204&view=diff
==============================================================================
--- whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java
(original)
+++ whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java Tue
Sep 20 15:49:40 2011
@@ -344,7 +344,7 @@ public class ClusterSpecTest {
public void testFirewallRules() throws Exception {
PropertiesConfiguration conf = new
PropertiesConfiguration("whirr-core-test.properties");
conf.setProperty("whirr.firewall-rules", "8000,8001");
- conf.setProperty("whirr.firewall-rules-serviceA", "9000,9001");
+ conf.setProperty("whirr.firewall-rules.serviceA", "9000,9001");
ClusterSpec spec = ClusterSpec.withTemporaryKeys(
conf);
Modified: whirr/trunk/src/site/xdoc/configuration-guide.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/src/site/xdoc/configuration-guide.xml?rev=1173204&r1=1173203&r2=1173204&view=diff
==============================================================================
--- whirr/trunk/src/site/xdoc/configuration-guide.xml (original)
+++ whirr/trunk/src/site/xdoc/configuration-guide.xml Tue Sep 20 15:49:40 2011
@@ -559,13 +559,13 @@ xsi:schemaLocation="http://maven.apache.
</tr>
<tr valign="top">
<td>
- <tt>whirr.firewall-rules-{role}</tt>
+ <tt>whirr.firewall-rules.{role}</tt>
</td>
<td>
- <tt>--firewall-rules-{role}</tt>
+ <tt>--firewall-rules.{role}</tt>
</td>
<td>none</td>
- <td>A comma-separated list of port numbers to open on instances with a
specific role. Replace {role} the actual role name. E.g.
<tt>whirr.firewall-rules-hbase-master=10101</tt>.</td>
+ <td>A comma-separated list of port numbers to open on instances with a
specific role. Replace {role} the actual role name. E.g.
<tt>whirr.firewall-rules.hbase-master=10101</tt>.</td>
</tr>
</table>
<p>
