Compatibility with tomcat 8.

tomcat/tasks/main.yml

@@ -8,10 +8,12 @@
     - tomcat_jmx_auth_enabled
   tags: [ 'tomcat', 'jmx' ]
 - import_tasks: tomcat-log4j-logging.yml
-  when: tomcat_use_log4j
+  when:
+    - tomcat_use_log4j
+    - tomcat_version <= '7'
   tags: [ 'tomcat', 'tomcat_log4j' ]
 - import_tasks: tomcat-logger-logging.yml
-  when: not tomcat_use_log4j
+  when: not tomcat_use_log4j or tomcat_version > '7'
 - import_tasks: access_log.yml
   when: tomcat_access_log_enabled
 - import_tasks: pgsql_jdbc.yml

tomcat/tasks/tomcat-admin.yml

@@ -1,7 +1,6 @@
 ---
 - name: Install the tomcat console management package
-  apt: pkg={{ item }} state={{ tomcat_pkg_state }}
+  apt: pkg=tomcat{{ tomcat_version }}-admin state={{ tomcat_pkg_state }}
-  with_items: 'tomcat{{ tomcat_version }}-admin'
   tags: tomcat
 
 - name: Install the tomcat users file

tomcat/tasks/tomcat-logger-logging.yml

@@ -10,7 +10,7 @@
 - name: Configure tomcat to use the standard version of the juli library
   file: src=/usr/share/java/{{ item }} dest={{ tomcat_catalina_home_dir }}/bin/{{ item }} state=link
   with_items:
-    - tomcat-juli.jar
+    - 'tomcat{{ tomcat_version }}-juli.jar'
   notify: tomcat restart
   tags: tomcat
 

tomcat/tasks/tomcat-pkgs.yml

@@ -1,7 +1,6 @@
 ---
 - name: Install the tomcat packages
-  apt: pkg={{ item }} state={{ tomcat_pkg_state }}
+  apt: pkg={{ tomcat_pkgs }} state={{ tomcat_pkg_state }}
-  with_items: '{{ tomcat_pkgs }}'
   tags: tomcat
 
 - name: Create the tomcat tmp directory