[jbossweb-commits] JBossWeb SVN: r711 - in trunk: res and 2 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2008-07-11 10:21:10 -0400 (Fri, 11 Jul 2008)
New Revision: 711
Modified:
trunk/java/org/apache/catalina/startup/HostConfig.java
trunk/res/confinstall/tomcat-users_1.xml
trunk/res/jboss-web.nsi
trunk/webapps/docs/changelog.xml
Log:
- Two minor fixes (nested docBase and i18n in installer).
Modified: trunk/java/org/apache/catalina/startup/HostConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/HostConfig.java 2008-07-11 14:20:12 UTC (rev
710)
+++ trunk/java/org/apache/catalina/startup/HostConfig.java 2008-07-11 14:21:10 UTC (rev
711)
@@ -607,7 +607,7 @@
docBase = new File(appBase(), context.getDocBase());
}
// If external docBase, register .xml as redeploy first
- if (!docBase.getCanonicalPath().startsWith(appBase().getAbsolutePath()))
{
+ if (!docBase.getCanonicalPath().startsWith(appBase().getAbsolutePath() +
File.separator)) {
isExternal = true;
deployedApp.redeployResources.put
(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
Modified: trunk/res/confinstall/tomcat-users_1.xml
===================================================================
--- trunk/res/confinstall/tomcat-users_1.xml 2008-07-11 14:20:12 UTC (rev 710)
+++ trunk/res/confinstall/tomcat-users_1.xml 2008-07-11 14:21:10 UTC (rev 711)
@@ -1,2 +1 @@
-<?xml version='1.0' encoding='utf-8'?>
<tomcat-users>
Modified: trunk/res/jboss-web.nsi
===================================================================
--- trunk/res/jboss-web.nsi 2008-07-11 14:20:12 UTC (rev 710)
+++ trunk/res/jboss-web.nsi 2008-07-11 14:21:10 UTC (rev 711)
@@ -517,6 +517,10 @@
Delete "$INSTDIR\conf\tomcat-users.xml"
FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
+ ; File will be written using current windows codepage
+ System::Call 'Kernel32::GetACP() i .r18'
+ FileWrite $R9 "<?xml version='1.0'
encoding='cp$R8'?>$\r$\n"
+
Push "$TEMP\confinstall\tomcat-users_1.xml"
Call copyFile
FileWrite $R9 $R5
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-07-11 14:20:12 UTC (rev 710)
+++ trunk/webapps/docs/changelog.xml 2008-07-11 14:21:10 UTC (rev 711)
@@ -17,13 +17,38 @@
<body>
<section name="JBoss Web 2.1.1.CR5 (remm)">
+ <subsection name="General">
+ <changelog>
+ <fix>
+ <bug>45332</bug>: Don't assume UTF-8 and use the correct encoding
when generating
+ tomcat-users.xml from the Windows installer. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<fix>
<jboss-jira>JBAS-4965</jboss-jira>: Ignore exploded JARs in extension
validator to avoid classcast. (remm)
</fix>
+ <fix>
+ <bug>45285</bug>: Look for annotations up the class hierarchy.
(markt)
+ </fix>
+ <fix>
+ Concurrency issues on ClusterListener.status with multiple engines. (jfclere)
+ </fix>
+ <fix>
+ <bug>42678</bug>: Only ignore docBase it it really is a subdir of
appBase. (markt)
+ </fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>42565</bug>: EL ternary expression without space before colon
now works.
+ Patch provided by Lucas Galfaso. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="JBoss Web 2.1.1.CR4 (remm)">