use loader for war extraction

Also set the version added in the docs

salt/modules/tomcat.py

@@ -176,7 +176,7 @@ def _auth(uri):
     return _build_opener(basic, digest)
 
 
-def _extract_war_version(war):
+def extract_war_version(war):
     '''
     Extract the version from the war file name.  There does not seem to be a
     standard for encoding the version into the `war file name
@@ -609,7 +609,7 @@ def deploy_war(war,
     # If parallel versions are desired or not disabled
     if version is True:
         # Set it to defined version or attempt extract
-        version = version or _extract_war_version(war)
+        version = version or extract_war_version(war)
 
         if version != ('' or None):
             # Only pass version to Tomcat if not undefined

salt/states/tomcat.py

@@ -57,9 +57,6 @@ Notes
 
 from __future__ import absolute_import
 
-# import salt libs
-from salt.modules.tomcat import _extract_war_version
-
 
 # Private
 def __virtual__():
@@ -110,7 +107,7 @@ def war_deployed(name,
 
         Use ``False`` to prevent guessing the version and keeping it blank.
 
-        .. versionadded:: 2016.PLEASE_LET_ME_KNOW
+        .. versionadded:: 2016.11.0
 
     Example:
 
@@ -138,7 +135,7 @@ def war_deployed(name,
 
     # if version is defined or False, we don't want to overwrite
     if version == '':
-        version = _extract_war_version(war) or ""
+        version = __salt__['tomcat.extract_war_version'](war) or ''
     elif not version:
         version = ''
     else:

tests/unit/states/tomcat_test.py

@@ -8,6 +8,7 @@ from __future__ import absolute_import
 
 # Import Salt Libs
 from salt.states import tomcat
+from salt.modules import tomcat as tomcatmod
 
 # Import Salt Testing Libs
 from salttesting import TestCase, skipIf
@@ -22,7 +23,7 @@ from salttesting.mock import (
 ensure_in_syspath('../../')
 
 # Globals
-tomcat.__salt__ = {}
+tomcat.__salt__ = {'tomcat.extract_war_version': tomcatmod.extract_war_version}
 tomcat.__opts__ = {}
 tomcat.__env__ = {}