Merge pull request #105 from preussal/master

Add nested components

pillar.example

@@ -200,3 +200,12 @@ tomcat:
               maxActive: 20
               maxIdle: 10
               maxWait: -1
+
+          Resources:
+            PostResources:
+              className: org.apache.catalina.webresources.DirResourceSet
+              base: "/var/lib/tomcat8/appconfig"
+              webAppMount: "/WEB-INF/classes"
+
+
+

tomcat/files/context.xml

@@ -37,13 +37,33 @@
     <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
 
 {% for element_type, elements in context_elements.items() -%}
-  {% for element, params in elements.items() -%}
+  {% if (element_type|string() == "Resource") -%}
+    {% for element, params in elements.items() %}
     <{{ element_type }}
             {%- for k, v in params.items() %}
             {{ k }}="{{ v }}"
             {%- endfor %}
     />
-  {% endfor -%}
+    {% endfor -%}
+  {% elif (element_type|string() == "Resources") -%}
+    <Resources>
+    {%- for element, params in elements.items() %}
+      <{{ element }}
+            {%- for k, v in params.items() %}
+            {{ k }}="{{ v }}"
+            {%- endfor %}
+      />
+    {% endfor -%}
+    </Resources>
+  {% else %}
+    {% for element, params in elements.items() -%}
+    <{{ element_type }}
+            {%- for k, v in params.items() %}
+            {{ k }}="{{ v }}"
+            {%- endfor %}
+    />
+    {% endfor -%}
+  {% endif -%}
 {% endfor -%}
 
     <!-- Uncomment this to disable session persistence across Tomcat restarts -->