From 53c02c5007bd7fc6a31d37d38b36465fe68e8d6b Mon Sep 17 00:00:00 2001
From: Antoine Cotten <tonio.cotten@gmail.com>
Date: Fri, 19 Jun 2015 23:18:40 +0200
Subject: [PATCH] refactoring

---
 manifests/instance.pp                   | 32 ++++++++++++-------------
 templates/instance/host-manager.xml.erb | 20 ----------------
 templates/instance/manager.xml.erb      | 20 ----------------
 3 files changed, 15 insertions(+), 57 deletions(-)
 delete mode 100644 templates/instance/host-manager.xml.erb
 delete mode 100644 templates/instance/manager.xml.erb

diff --git a/manifests/instance.pp b/manifests/instance.pp
index bc8ed45..1c013b0 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -965,32 +965,30 @@
         'package' : {
           $admin_webapps_path = $::osfamily ? {
             'Debian' => "/usr/share/${::tomcat::admin_webapps_package_name_real}",
-            default  => "\${catalina.home}/webapps"
+            default  => '${catalina.home}/webapps'
           } }
         default   : {
-          $admin_webapps_path = "\${catalina.home}/webapps"
+          $admin_webapps_path = '${catalina.home}/webapps'
         }
       }
 
-      file { "instance ${name} Catalina dir":
-        ensure  => directory,
-        path    => "${catalina_base_real}/conf/Catalina",
-        require => File["${catalina_base_real}/conf"]
-      } ->
-      file { "instance ${name} Catalina/${host_name} dir":
-        ensure => directory,
-        path   => "${catalina_base_real}/conf/Catalina/${host_name}"
+      file { ["${catalina_base_real}/conf/Catalina","${catalina_base_real}/conf/Catalina/${host_name}"]:
+        ensure  => directory
       } ->
-      file {
+      ::tomcat::context {
         "instance ${name} manager.xml":
-          ensure  => present,
-          path    => "${catalina_base_real}/conf/Catalina/${host_name}/manager.xml",
-          content => template("${module_name}/instance/manager.xml.erb");
+          path   => "${catalina_base_real}/conf/Catalina/${host_name}/manager.xml",
+          params => { 'path'    => '/manager',
+                      'docBase' => "${admin_webapps_path}/manager",
+                      'antiResourceLocking' => false,
+                      'privileged' => 'true' };
 
         "instance ${name} host-manager.xml":
-          ensure  => present,
-          path    => "${catalina_base_real}/conf/Catalina/${host_name}/host-manager.xml",
-          content => template("${module_name}/instance/host-manager.xml.erb")
+          path   => "${catalina_base_real}/conf/Catalina/${host_name}/host-manager.xml",
+          params => { 'path'    => '/host-manager',
+                      'docBase' => "${admin_webapps_path}/host-manager",
+                      'antiResourceLocking' => false,
+                      'privileged' => 'true' }
       }
     } else {
       # warn if admin webapps were selected for installation
diff --git a/templates/instance/host-manager.xml.erb b/templates/instance/host-manager.xml.erb
deleted file mode 100644
index 4e37cbb..0000000
--- a/templates/instance/host-manager.xml.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<Context path="/host-manager"
-         docBase="<%= @admin_webapps_path %>/host-manager"
-         antiResourceLocking="false" privileged="true" />
diff --git a/templates/instance/manager.xml.erb b/templates/instance/manager.xml.erb
deleted file mode 100644
index bf00a5d..0000000
--- a/templates/instance/manager.xml.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<Context path="/manager"
-         docBase="<%= @admin_webapps_path %>/manager"
-         antiResourceLocking="false" privileged="true" />