Author: markt
Date: Tue May 20 00:50:46 2008
New Revision: 658143
URL: http://svn.apache.org/viewvc?rev=658143&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955
Use correct location for endorsed dir
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658143&r1=658142&r2=658143&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 00:50:46 2008
@@ -44,12 +44,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955
- Use correct location for endorsed dir
- http://svn.apache.org/viewvc?rev=654632&view=rev
- +1: markt, remm, yoavs
- -1:
-
* Fix NPE in patch for bug 44986
http://svn.apache.org/viewvc?rev=657149&view=rev
+1: markt, remm, yoavs
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=658143&r1=658142&r2=658143&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Tue May 20 00:50:46 2008
@@ -338,7 +338,7 @@
Section -post
nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Classpath
"$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start
--StopParams stop --StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"
--StdOutput auto --StdError auto'
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"
--StdOutput auto --StdError auto'
WriteUninstaller "$INSTDIR\Uninstall.exe"
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=658143&r1=658142&r2=658143&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 20 00:50:46 2008
@@ -321,6 +321,10 @@
<fix>
Fix build for JavaDoc. Patch provided by Stephen Bannasch. (markt)
</fix>
+ <fix>
+ <bug>44955</bug>: Use correct location for endorsed directory in
Windows
+ installer. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
