Attachment #31512 for bug #56382

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

Lines 605-613 Link Here

(-)java/org/apache/catalina/startup/HostConfig.java (-4 / +22 lines)
605		605
606	DeployedApplication deployedApp =	606	DeployedApplication deployedApp =
607	new DeployedApplication(cn.getName(), true);	607	new DeployedApplication(cn.getName(), true);
608		608	long startTime = 0;
609	// Assume this is a configuration descriptor and deploy it	609	// Assume this is a configuration descriptor and deploy it
610	if(log.isInfoEnabled()) {	610	if(log.isInfoEnabled()) {
		611	startTime = System.currentTimeMillis();
611	log.info(sm.getString("hostConfig.deployDescriptor",	612	log.info(sm.getString("hostConfig.deployDescriptor",
612	contextXml.getAbsolutePath()));	613	contextXml.getAbsolutePath()));
613	}	614	}
Lines 744-749 Link Here
744	if (host.findChild(context.getName()) != null) {	745	if (host.findChild(context.getName()) != null) {
745	deployed.put(context.getName(), deployedApp);	746	deployed.put(context.getName(), deployedApp);
746	}	747	}
		748	if (log.isInfoEnabled()) {
		749	log.info(sm.getString("hostConfig.deployDescriptor.finished",
		750	contextXml.getAbsolutePath(), Long.valueOf(System.currentTimeMillis() - startTime)));
		751	}
747	}	752	}
748		753
749		754
Lines 864-869 Link Here
864	InputStream istream = null;	869	InputStream istream = null;
865	FileOutputStream fos = null;	870	FileOutputStream fos = null;
866	BufferedOutputStream ostream = null;	871	BufferedOutputStream ostream = null;
		872	long startTime = 0;
867		873
868	File xml = new File(appBase(),	874	File xml = new File(appBase(),
869	cn.getBaseName() + "/META-INF/context.xml");	875	cn.getBaseName() + "/META-INF/context.xml");
Lines 1041-1049 Link Here
1041	xml.exists() && deployXML && copyThisXml);	1047	xml.exists() && deployXML && copyThisXml);
1042		1048
1043	// Deploy the application in this WAR file	1049	// Deploy the application in this WAR file
1044	if(log.isInfoEnabled())	1050	if(log.isInfoEnabled()) {
		1051	startTime = System.currentTimeMillis();
1045	log.info(sm.getString("hostConfig.deployWar",	1052	log.info(sm.getString("hostConfig.deployWar",
1046	war.getAbsolutePath()));	1053	war.getAbsolutePath()));
		1054	}
1047		1055
1048	try {	1056	try {
1049	// Populate redeploy resources with the WAR file	1057	// Populate redeploy resources with the WAR file
Lines 1099-1104 Link Here
1099	}	1107	}
1100		1108
1101	deployed.put(cn.getName(), deployedApp);	1109	deployed.put(cn.getName(), deployedApp);
		1110	if (log.isInfoEnabled()) {
		1111	log.info(sm.getString("hostConfig.deployWar.finished",
		1112	war.getAbsolutePath(), Long.valueOf(System.currentTimeMillis() - startTime)));
		1113	}
1102	}	1114	}
1103		1115
1104		1116
Lines 1147-1157 Link Here
1147	*/	1159	*/
1148	protected void deployDirectory(ContextName cn, File dir) {	1160	protected void deployDirectory(ContextName cn, File dir) {
1149		1161
1150		1162	long startTime = 0;
1151	// Deploy the application in this directory	1163	// Deploy the application in this directory
1152	if( log.isInfoEnabled() )	1164	if( log.isInfoEnabled() ) {
		1165	startTime = System.currentTimeMillis();
1153	log.info(sm.getString("hostConfig.deployDir",	1166	log.info(sm.getString("hostConfig.deployDir",
1154	dir.getAbsolutePath()));	1167	dir.getAbsolutePath()));
		1168	}
1155		1169
1156	Context context = null;	1170	Context context = null;
1157	File xml = new File(dir, Constants.ApplicationContextXml);	1171	File xml = new File(dir, Constants.ApplicationContextXml);
Lines 1275-1280 Link Here
1275	}	1289	}
1276		1290
1277	deployed.put(cn.getName(), deployedApp);	1291	deployed.put(cn.getName(), deployedApp);
		1292	if( log.isInfoEnabled() ) {
		1293	log.info(sm.getString("hostConfig.deployDir.finished",
		1294	dir.getAbsolutePath(), Long.valueOf(System.currentTimeMillis() - startTime)));
		1295	}
1278	}	1296	}
1279		1297
1280		1298




hostConfig.createDirs=Unable to create directory for deployment: {0}
hostConfig.deploy=Deploying web application directory {0}
hostConfig.deployDescriptor=Deploying configuration descriptor {0}
hostConfig.deployDescriptor.finished=Deployment of configuration descriptor {0} has finished in {1} ms
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.localDocBaseSpecified=A docBase {0} inside the host appBase has been specified, and will be ignored
hostConfig.deployDir=Deploying web application directory {0}
hostConfig.deployDir.finished=Deployment of web application directory {0} has finished in {1} ms
hostConfig.deployDir.error=Error deploying web application directory {0}
hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete
hostConfig.deployWar=Deploying web application archive {0}
hostConfig.deployWar.finished=Deployment of web application archive {0} has finished in {1} ms
hostConfig.deployWar.error=Error deploying web application archive {0}
hostConfig.deployWar.hiddenDir=The directory [{0}] will be ignored because the WAR [{1}] takes priority and unpackWARs is false
hostConfig.deployWar.threaded.error=Error waiting for multi-thread deployment of WAR files to complete

Return to bug 56382

Lines 88-101 Link Here

(-)java/org/apache/catalina/startup/LocalStrings.properties (+3 lines)
88	hostConfig.createDirs=Unable to create directory for deployment: {0}	88	hostConfig.createDirs=Unable to create directory for deployment: {0}
89	hostConfig.deploy=Deploying web application directory {0}	89	hostConfig.deploy=Deploying web application directory {0}
90	hostConfig.deployDescriptor=Deploying configuration descriptor {0}	90	hostConfig.deployDescriptor=Deploying configuration descriptor {0}
		91	hostConfig.deployDescriptor.finished=Deployment of configuration descriptor {0} has finished in {1} ms
91	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.	92	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.
92	hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0}	93	hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0}
93	hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of context descriptors to complete	94	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	95	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}	96	hostConfig.deployDir=Deploying web application directory {0}
		97	hostConfig.deployDir.finished=Deployment of web application directory {0} has finished in {1} ms
96	hostConfig.deployDir.error=Error deploying web application directory {0}	98	hostConfig.deployDir.error=Error deploying web application directory {0}
97	hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete	99	hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete
98	hostConfig.deployWar=Deploying web application archive {0}	100	hostConfig.deployWar=Deploying web application archive {0}
		101	hostConfig.deployWar.finished=Deployment of web application archive {0} has finished in {1} ms
99	hostConfig.deployWar.error=Error deploying web application archive {0}	102	hostConfig.deployWar.error=Error deploying web application archive {0}
100	hostConfig.deployWar.hiddenDir=The directory [{0}] will be ignored because the WAR [{1}] takes priority and unpackWARs is false	103	hostConfig.deployWar.hiddenDir=The directory [{0}] will be ignored because the WAR [{1}] takes priority and unpackWARs is false
101	hostConfig.deployWar.threaded.error=Error waiting for multi-thread deployment of WAR files to complete	104	hostConfig.deployWar.threaded.error=Error waiting for multi-thread deployment of WAR files to complete