Merge branch '3.x'

Author: nebhale

config/tomcat.yml

@@ -24,13 +24,13 @@ external_configuration:
   version: 1.+
   repository_root: 
 lifecycle_support:
-  version: 2.+
+  version: 3.+
   repository_root: "{default.repository.root}/tomcat-lifecycle-support"
 logging_support:
-  version: 2.+
+  version: 3.+
   repository_root: "{default.repository.root}/tomcat-logging-support"
 access_logging_support:
-  version: 2.+
+  version: 3.+
   repository_root: "{default.repository.root}/tomcat-access-logging-support"
   access_logging: disabled
 redis_store:

resources/tomcat/conf/logging.properties

@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-handlers: com.gopivotal.cloudfoundry.tomcat.logging.CloudFoundryConsoleHandler
-.handlers: com.gopivotal.cloudfoundry.tomcat.logging.CloudFoundryConsoleHandler
+handlers: org.cloudfoundry.tomcat.logging.CloudFoundryConsoleHandler
+.handlers: org.cloudfoundry.tomcat.logging.CloudFoundryConsoleHandler
 
-com.gopivotal.cloudfoundry.tomcat.logging.CloudFoundryConsoleHandler.level: FINE
+org.cloudfoundry.tomcat.logging.CloudFoundryConsoleHandler.level: FINE
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level: INFO
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level: INFO

resources/tomcat/conf/server.xml

@@ -22,12 +22,12 @@
 
         <Engine defaultHost='localhost' name='Catalina'>
             <Valve className='org.apache.catalina.valves.RemoteIpValve' protocolHeader='x-forwarded-proto'/>
-            <Valve className='com.gopivotal.cloudfoundry.tomcat.logging.access.CloudFoundryAccessLoggingValve'
+            <Valve className='org.cloudfoundry.tomcat.logging.access.CloudFoundryAccessLoggingValve'
                    pattern='[ACCESS] %{org.apache.catalina.AccessLog.RemoteAddr}r %l %t %D %F %B %S vcap_request_id:%{X-Vcap-Request-Id}i'
                    enabled='${access.logging.enabled}'/>
             <Host name='localhost'
                   failCtxIfServletStartFails='true'>
-                <Listener className='com.gopivotal.cloudfoundry.tomcat.lifecycle.ApplicationStartupFailureDetectingLifecycleListener'/>
+                <Listener className='org.cloudfoundry.tomcat.lifecycle.ApplicationStartupFailureDetectingLifecycleListener'/>
             </Host>
         </Engine>
     </Service>