Author: markt Date: Tue Feb 27 14:10:33 2018 New Revision: 1825455 URL: http://svn.apache.org/viewvc?rev=1825455&view=rev Log: Consistent naming and alphabetical order for deployment descriptor strings
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1825455&r1=1825454&r2=1825455&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue Feb 27 14:10:33 2018 @@ -94,13 +94,13 @@ hostConfig.cce=Lifecycle event data obje hostConfig.context.remove=Error while removing context [{0}] hostConfig.context.restart=Error during context [{0}] restart hostConfig.createDirs=Unable to create directory for deployment: [{0}] -hostConfig.deployDescriptor=Deploying configuration descriptor [{0}] +hostConfig.deployDescriptor=Deploying deployment descriptor [{0}] hostConfig.deployDescriptor.blocked=The web application with context path [{0}] was not deployed because it contained a deployment descriptor [{1}] which may include configuration necessary for the secure deployment of the application but processing of deployment descriptors is prevented by the deployXML setting of this host. An appropriate descriptor should be created at [{2}] to deploy this application. -hostConfig.deployDescriptor.error=Error deploying configuration descriptor [{0}] -hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of context descriptors to complete +hostConfig.deployDescriptor.error=Error deploying deployment descriptor [{0}] +hostConfig.deployDescriptor.finished=Deployment of deployment descriptor [{0}] has finished in [{1}] ms hostConfig.deployDescriptor.localDocBaseSpecified=A docBase [{0}] inside the host appBase has been specified, and will be ignored -hostConfig.deployDescriptor.finished=Deployment of configuration descriptor [{0}] has finished in [{1}] ms hostConfig.deployDescriptor.path=The path attribute with value [{0}] in deployment descriptor [{1}] has been ignored +hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of deployment descriptors to complete hostConfig.deployDir=Deploying web application directory [{0}] hostConfig.deployDir.error=Error deploying web application directory [{0}] hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org