Attachment #31506 for bug #56382

View | Details | Raw Unified | Return to bug 56382
Collapse All | Expand All

Lines 1147-1155 Link Here

(-)org/apache/catalina/startup/HostConfig.java (-1 / +5 lines)
1147	*/	1147	*/
1148	protected void deployDirectory(ContextName cn, File dir) {	1148	protected void deployDirectory(ContextName cn, File dir) {
1149		1149
1150		1150	long startTime = 0;
1151	// Deploy the application in this directory	1151	// Deploy the application in this directory
1152	if( log.isInfoEnabled() )	1152	if( log.isInfoEnabled() )
		1153	startTime = System.currentTimeMillis();
1153	log.info(sm.getString("hostConfig.deployDir",	1154	log.info(sm.getString("hostConfig.deployDir",
1154	dir.getAbsolutePath()));	1155	dir.getAbsolutePath()));
1155		1156
Lines 1275-1280 Link Here
1275	}	1276	}
1276		1277
1277	deployed.put(cn.getName(), deployedApp);	1278	deployed.put(cn.getName(), deployedApp);
		1279	if( log.isInfoEnabled() )
		1280	log.info(sm.getString("hostConfig.deployDir.finished",
		1281	dir.getAbsolutePath(), System.currentTimeMillis() - startTime));
1278	}	1282	}
1279		1283
1280		1284

Lines 93-98 Link Here

(-)org/apache/catalina/startup/LocalStrings.properties (+1 lines)
93	hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of context descriptors to complete	93	hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of context descriptors to complete
94	hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the host appBase has been specified, and will be ignored	94	hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the host appBase has been specified, and will be ignored
95	hostConfig.deployDir=Deploying web application directory {0}	95	hostConfig.deployDir=Deploying web application directory {0}
		96	hostConfig.deployDir.finished=Deployment of web application directory {0} has finished in {1} ms.
96	hostConfig.deployDir.error=Error deploying web application directory {0}	97	hostConfig.deployDir.error=Error deploying web application directory {0}
97	hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete	98	hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete
98	hostConfig.deployWar=Deploying web application archive {0}	99	hostConfig.deployWar=Deploying web application archive {0}

Return to bug 56382