[patch] Index Page Lacalisation

patch.diff (text/plain), 53.36 KB, created by Ivan Krasnov on 2018-10-22 02:14:50 UTC

(hide)

Description: Index Page Lacalisation

Filename:

MIME Type:

Creator: Ivan Krasnov

Created: 2018-10-22 02:14:50 UTC

Size: 53.36 KB

patch

obsolete

>Index: java/javax/index/LocalStrings.properties >=================================================================== >--- java/javax/index/LocalStrings.properties (nonexistent) >+++ java/javax/index/LocalStrings.properties (working copy) >@@ -0,0 +1,68 @@ >+index.home=Home >+index.documentation=Documentation >+index.configuration=Configuration >+index.examples=Examples >+index.wiki=wiki >+index.mail=Mail >+index.help=Help >+index.security=Security >+index.manager=Manager >+index.clustering=Clustering/Session Replication HOW-TO >+index.congrats=If you're seeing this, you've successfully installed Tomcat. Congratulations! >+index.status=Server Status >+index.managerapp=Manager App >+index.server=Host Manager >+index.developer=Developer Quick Start >+index.setup=Tomcat Setup >+index.firstapp=First Web Application >+index.example=Examples >+index.servlet=Servlet Specifications >+index.versions=Tomcat Versions >+index.managing=Managing Tomcat >+index.p1=For security, access to the >+index.p2=manager webapp >+index.p3=is restricted.Users are defined in: >+index.access=In Tomcat 9.0 access to the manager application is split between different users. >+index.rmore=Read more... >+index.releasenotes=Release Notes >+index.changelog=Changelog >+index.migration=Migration Guide >+index.securitynotes=Security Notices >+index.Hdocumentation=Documentation >+index.tversion=Tomcat 9.0 Documentation >+index.tconfiguration=Tomcat 9.0 Configuration >+index.twiki=Tomcat Wiki >+index.tfind=Find additional important configuration information in: >+index.dev=Developers may be interested in: >+index.bugs=Tomcat 9.0 Bug Database >+index.rep=Tomcat 9.0 SVN Repository >+index.gethelp=Getting Help >+index.faq=FAQ >+index.maillist=Mailing Lists >+index.avlists=The following mailing lists are available: >+index.list1=Important announcements, releases, security vulnerability notifications. (Low volume). >+index.list2=User support and discussion >+index.list3=for Apache Taglibs >+index.list4=Development mailing list, including commit messages >+index.and=and >+index.data=JDBC DataSources >+index.downloads=Other Downloads >+index.connectors=Tomcat Connectors >+index.native=Tomcat Native >+index.taglibs=Taglibs >+index.deployer=Deployer >+index.otherdoc=Other Documentation >+index.modjk=mod_jk Documentation >+index.getinvolved=Get Involved >+index.overview=overview >+index.repositories=SVN Repositories >+index.other=Miscellaneous >+index.contact=Contact >+index.legal=Legal >+index.sponsorship=Sponsorship >+index.thanks=Thanks >+index.apachefound=Apache Software Foundation >+index.whoweare=Who We Are >+index.heritage=Heritage >+index.apachehome=Apache Home >+index.resources=Resources >\ No newline at end of file >Index: java/javax/index/LocalStrings_ru.properties >=================================================================== >--- java/javax/index/LocalStrings_ru.properties (nonexistent) >+++ java/javax/index/LocalStrings_ru.properties (working copy) >@@ -0,0 +1,68 @@ >+index.home=\u0414\u043E\u043C\u043E\u0439 >+index.documentation=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u044F >+index.configuration=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 >+index.examples=\u041F\u0440\u0438\u043C\u0435\u0440\u044B >+index.wiki=\u0421\u043F\u0440\u0430\u0432\u043E\u0447\u043D\u0438\u043A >+index.mail=\u0421\u043F\u0438\u0441\u043A\u0438 \u0440\u0430\u0441\u0441\u044B\u043B\u043E\u043A >+index.help=\u0421\u043F\u0440\u0430\u0432\u043A\u0430 >+index.security=\u041E \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u0445 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 >+index.manager=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043C\u0435\u043D\u0435\u0434\u0436\u0435\u0440\u043E\u043C \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439 >+index.clustering=\u0421\u0435\u0441\u0441\u0438\u043E\u043D\u043D\u043E\u0435 \u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 >+index.congrats=\u0415\u0441\u043B\u0438 \u0432\u044B \u0432\u0438\u0434\u0438\u0442\u0435 \u044D\u0442\u043E - \u0432\u044B \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u043B\u0438 Tomcat. \u041F\u043E\u0437\u0434\u0440\u0430\u0432\u043B\u044F\u0435\u043C! >+index.status=\u0421\u0442\u0430\u0442\u0443\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 >+index.managerapp=\u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 >+index.server=\u0421\u0435\u0440\u0432\u0435\u0440 >+index.developer=\u0411\u044B\u0441\u0442\u0440\u044B\u0439 \u0441\u0442\u0430\u0440\u0442 \u0434\u043B\u044F \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0447\u0438\u043A\u043E\u0432 >+index.setup=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 Tomcat >+index.firstapp=\u041F\u0435\u0440\u0432\u043E\u0435 \u0432\u0435\u0431-\u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 >+index.example=\u041F\u0440\u0438\u043C\u0435\u0440\u044B >+index.servlet=\u0421\u043F\u0435\u0446\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u0441\u0435\u0440\u0432\u043B\u0435\u0442\u043E\u0432 >+index.versions=\u0412\u0435\u0440\u0441\u0438\u0438 Tomcat >+index.managing=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 Tomcat >+index.p1=\u0412 \u0446\u0435\u043B\u044F\u0445 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 \u0434\u043E\u0441\u0442\u0443\u043F \u043A >+index.p2=\u043C\u0435\u043D\u0435\u0434\u0436\u0435\u0440\u0443 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439 >+index.p3=\u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D.\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438 \u0437\u0430\u043F\u0438\u0441\u0430\u043D\u044B \u0432: >+index.access=\u0412 Tomcat 9.0 \u0434\u043E\u0441\u0442\u0443\u043F \u043A \u043C\u0435\u043D\u0435\u0434\u0436\u0435\u0440\u0443 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439 \u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D \u043C\u0435\u0436\u0434\u0443 \u0440\u0430\u0437\u043D\u044B\u043C\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F\u043C\u0438. >+index.rmore=\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u0435\u0435... >+index.releasenotes=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0432\u0435\u0440\u0441\u0438\u0438 >+index.changelog=\u0421\u043F\u0438\u0441\u043E\u043A \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 >+index.migration=\u0420\u0443\u043A\u043E\u0432\u043E\u0434\u0441\u0442\u0432\u043E \u043F\u043E \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044E >+index.securitynotes=\u0417\u0430\u043C\u0435\u0447\u0430\u043D\u0438\u044F \u043F\u043E \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438 >+index.Hdocumentation=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u044F >+index.tversion= \u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u044F Tomcat 9.0 >+index.tconfiguration= \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 Tomcat 9.0 >+index.twiki=\u0421\u043F\u0440\u0430\u0432\u043E\u0447\u043D\u0438\u043A Tomcat >+index.tfind=\u041D\u0430\u0439\u0434\u0438\u0442\u0435 \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u0430\u0436\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0432: >+index.dev=\u0420\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0447\u0438\u043A\u0430\u043C \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u043D\u043E: >+index.bugs=\u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445 \u043E\u0448\u0438\u0431\u043E\u043A Tomcat 9.0 >+index.rep=Tomcat 9.0 SVN \u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0439 >+index.gethelp=\u041F\u043E\u043C\u043E\u0449\u044C >+index.faq=\u0421\u043F\u0440\u0430\u0432\u043A\u0430 >+index.maillist=\u041E\u0431\u0440\u0430\u0442\u043D\u0430\u044F \u0441\u0432\u044F\u0437\u044C >+index.avlists=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u043A\u0430\u043D\u0430\u043B\u044B \u0441\u0432\u044F\u0437\u0438: >+index.list1=\u0412\u0430\u0436\u043D\u044B\u0435 \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u044F, \u043D\u043E\u0432\u044B\u0435 \u0432\u0435\u0440\u0441\u0438\u0438, \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u044F \u043E\u0431 \u0443\u044F\u0437\u0432\u0438\u043C\u043E\u0441\u0442\u044F\u0445 \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438. >+index.list2=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 >+index.list3= \u0432 Apache Taglibs >+index.list4=\u041E\u0431\u0441\u0443\u0436\u0434\u0435\u043D\u0438\u0435 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 >+index.and=\u0438 >+index.data=\u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A \u0434\u0430\u043D\u043D\u044B\u0445 JDBC >+index.downloads=\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0438 >+index.connectors=Tomcat Connectors >+index.native=Tomcat Native >+index.taglibs=Taglibs >+index.deployer=Deployer >+index.otherdoc=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u044F >+index.modjk=mod_jk Documentation >+index.getinvolved=\u0423\u0437\u043D\u0430\u0442\u044C \u0431\u043E\u043B\u044C\u0448\u0435 >+index.overview=overview >+index.repositories=\u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0439 >+index.other=\u0420\u0430\u0437\u043D\u043E\u0435 >+index.contact=\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B >+index.legal=\u041F\u0440\u0430\u0432\u043E\u043E\u0431\u043B\u0430\u0434\u0430\u0442\u0435\u043B\u0438 >+index.sponsorship=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442 >+index.thanks=\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u043D\u043E\u0441\u0442\u0438 >+index.apachefound=Apache Software Foundation >+index.whoweare=\u0420\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0447\u0438\u043A\u0438 >+index.heritage=\u0418\u0441\u0442\u043E\u0440\u0438\u044F \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F >+index.apachehome=\u041E\u0444\u0438\u0446\u0430\u043B\u044C\u043D\u044B\u0439 \u0441\u0430\u0439\u0442 Apache >+index.resources=\u041F\u043E\u043B\u0435\u0437\u043D\u044B\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B >\ No newline at end of file >Index: java/javax/index/start.java >=================================================================== >--- java/javax/index/start.java (nonexistent) >+++ java/javax/index/start.java (working copy) >@@ -0,0 +1,94 @@ >+package javax.index; >+ >+ >+import java.io.IOException; >+import java.io.OutputStream; >+import java.util.ResourceBundle; >+ >+public class start extends OutputStream { >+ >+ private static final String LSTRING_FILE = "javax.index.LocalStrings"; >+ private static final ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); >+ >+ >+ >+ public static String home = lStrings.getString("index.home"); >+ public static String documentation = lStrings.getString("index.documentation"); >+ public static String configuration = lStrings.getString("index.configuration"); >+ public static String examples = lStrings.getString("index.examples"); >+ public static String wiki = lStrings.getString("index.wiki"); >+ public static String mail = lStrings.getString("index.mail"); >+ public static String help = lStrings.getString("index.help"); >+ public static String congrats = lStrings.getString("index.congrats"); >+ public static String security = lStrings.getString("index.security"); >+ public static String manager = lStrings.getString("index.manager"); >+ public static String clustering = lStrings.getString("index.clustering"); >+ public static String status = lStrings.getString("index.status"); >+ public static String managerapp = lStrings.getString("index.managerapp"); >+ public static String server = lStrings.getString("index.server"); >+ public static String developer = lStrings.getString("index.developer"); >+ public static String setup = lStrings.getString("index.setup"); >+ public static String firstapp = lStrings.getString("index.firstapp"); >+ public static String example = lStrings.getString("index.example"); >+ public static String servlet = lStrings.getString("index.servlet"); >+ public static String versions = lStrings.getString("index.versions"); >+ public static String managing = lStrings.getString("index.managing"); >+ public static String p1 = lStrings.getString("index.p1"); >+ public static String p2 = lStrings.getString("index.p2"); >+ public static String p3 = lStrings.getString("index.p3"); >+ public static String access = lStrings.getString("index.access"); >+ public static String rmore = lStrings.getString("index.rmore"); >+ public static String releasenotes = lStrings.getString("index.releasenotes"); >+ public static String changelog = lStrings.getString("index.changelog"); >+ public static String migration = lStrings.getString("index.migration"); >+ public static String securitynotes = lStrings.getString("index.securitynotes"); >+ public static String Hdocumentation = lStrings.getString("index.Hdocumentation"); >+ public static String tversion = lStrings.getString("index.tversion"); >+ public static String tconfiguration = lStrings.getString("index.tconfiguration"); >+ public static String twiki = lStrings.getString("index.twiki"); >+ public static String tfind = lStrings.getString("index.tfind"); >+ public static String dev = lStrings.getString("index.dev"); >+ public static String bugs = lStrings.getString("index.bugs"); >+ public static String rep = lStrings.getString("index.rep"); >+ public static String gethelp = lStrings.getString("index.gethelp"); >+ public static String faq = lStrings.getString("index.faq"); >+ public static String maillist = lStrings.getString("index.maillist"); >+ public static String avlists = lStrings.getString("index.avlists"); >+ public static String list1 = lStrings.getString("index.list1"); >+ public static String list2 = lStrings.getString("index.list2"); >+ public static String list3 = lStrings.getString("index.list3"); >+ public static String list4 = lStrings.getString("index.list4"); >+ public static String and = lStrings.getString("index.and"); >+ public static String data = lStrings.getString("index.data"); >+ public static String downloads = lStrings.getString("index.downloads"); >+ public static String connectors = lStrings.getString("index.connectors"); >+ public static String natives = lStrings.getString("index.native"); >+ public static String taglibs = lStrings.getString("index.taglibs"); >+ public static String deployer = lStrings.getString("index.deployer"); >+ public static String otherdoc = lStrings.getString("index.otherdoc"); >+ public static String modjk = lStrings.getString("index.modjk"); >+ public static String getinvolved = lStrings.getString("index.getinvolved"); >+ public static String overview = lStrings.getString("index.overview"); >+ public static String repositories = lStrings.getString("index.repositories"); >+ public static String other = lStrings.getString("index.other"); >+ public static String contact = lStrings.getString("index.contact"); >+ public static String legal = lStrings.getString("index.legal"); >+ public static String sponsorship = lStrings.getString("index.sponsorship"); >+ public static String thanks = lStrings.getString("index.thanks"); >+ public static String apachefound = lStrings.getString("index.apachefound"); >+ public static String whoweare = lStrings.getString("index.whoweare"); >+ public static String heritage = lStrings.getString("index.heritage"); >+ public static String apachehome = lStrings.getString("index.apachehome"); >+ public static String resources = lStrings.getString("index.resources"); >+ >+ >+ >+ >+ >+ @Override >+ public void write(int b) throws IOException { >+ // TODO Auto-generated method stub >+ >+ } >+ >+} >\ No newline at end of file >Index: java/org/apache/catalina/manager/LocalStrings.properties >=================================================================== >--- java/org/apache/catalina/manager/LocalStrings.properties (revision 1838517) >+++ java/org/apache/catalina/manager/LocalStrings.properties (working copy) >@@ -136,3 +136,38 @@ > managerServlet.vminfo=OK - VM info > statusServlet.title=Server Status > statusServlet.complete=Complete Server Status >+htmlManagerServlet.osPhysicalMemory=Physical memory: >+htmlManagerServlet.osAvailableMemory=Available memory: >+htmlManagerServlet.osTotalPageFile=Total page file: >+htmlManagerServlet.osFreePageFile=Free page file: >+htmlManagerServlet.osMemoryLoad=Memory load: >+htmlManagerServlet.osKernelTime=Process kernel time: >+htmlManagerServlet.osUserTime=Process user time: >+htmlManagerServlet.jvmFreeMemory=Free Memory: >+htmlManagerServlet.jvmMaxMemory=Max Memory: >+htmlManagerServlet.jvmTotalMemory=Total Memory: >+htmlManagerServlet.jvmTableTitleMemoryPool=Memory Pool >+htmlManagerServlet.jvmTableTitleType=Type >+htmlManagerServlet.jvmTableTitleInitial=Initial >+htmlManagerServlet.jvmTableTitleTotal=Total >+htmlManagerServlet.jvmTableTitleMaximum=Maximum >+htmlManagerServlet.jvmTableTitleUsed=Used >+htmlManagerServlet.connectorStateMaxThreads=Max threads: >+htmlManagerServlet.connectorStateThreadCount=Current thread count: >+htmlManagerServlet.connectorStateThreadBusy=Current thread busy: >+htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count: >+htmlManagerServlet.connectorStateMaxProcessingTime=Max processing time: >+htmlManagerServlet.connectorStateProcessingTime=Processing time: >+htmlManagerServlet.connectorStateRequestCount=Request count: >+htmlManagerServlet.connectorStateErrorCount=Error count: >+htmlManagerServlet.connectorStateBytesRecieved=Bytes received: >+htmlManagerServlet.connectorStateBytesSent=Bytes sent: >+htmlManagerServlet.connectorStateTableTittleStage=Stage >+htmlManagerServlet.connectorStateTableTittleTime=Time >+htmlManagerServlet.connectorStateTableTittleBSent=B Sent >+htmlManagerServlet.connectorStateTableTittleBRecv=B Recv >+htmlManagerServlet.connectorStateTableTittleClientForw=Client (Forwarded) >+htmlManagerServlet.connectorStateTableTittleClientAct=Client (Actual) >+htmlManagerServlet.connectorStateTableTittleVHost=VHost >+htmlManagerServlet.connectorStateTableTittleRequest=Request >+htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service F: Finishing R: Ready K: Keepalive >Index: java/org/apache/catalina/manager/LocalStrings_ru.properties >=================================================================== >--- java/org/apache/catalina/manager/LocalStrings_ru.properties (revision 1838517) >+++ java/org/apache/catalina/manager/LocalStrings_ru.properties (working copy) >@@ -136,3 +136,38 @@ > managerServlet.vminfo=OK - VM инфо > statusServlet.title=Состояние сервера > statusServlet.complete=Состояние сервера >+htmlManagerServlet.osPhysicalMemory=\u0424\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u043F\u0430\u043C\u044F\u0442\u044C: >+htmlManagerServlet.osAvailableMemory=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0430\u044F \u043F\u0430\u043C\u044F\u0442\u044C: >+htmlManagerServlet.osTotalPageFile=\u0412\u0441\u0435\u0433\u043E \u0444\u0430\u0439\u043B\u043E\u0432\u044B\u0445 \u0441\u0442\u0440\u0430\u043D\u0438\u0446: >+htmlManagerServlet.osFreePageFile=\u0421\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u0435 \u0444\u0430\u0439\u043B\u043E\u0432\u044B\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B: >+htmlManagerServlet.osMemoryLoad=\u041F\u0430\u043C\u044F\u0442\u0438 \u0417\u0430\u0433\u0440\u0443\u0436\u0435\u043D\u043E: >+htmlManagerServlet.osKernelTime=\u0412\u0440\u0435\u043C\u044F \u041E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430 \u044F\u0434\u0440\u043E\u043C: >+htmlManagerServlet.osUserTime=\u0412\u0440\u0435\u043C\u044F \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F: >+htmlManagerServlet.jvmFreeMemory=\u0421\u0432\u043E\u0431\u043E\u0434\u043D\u0430\u044F \u041F\u0430\u043C\u044F\u0442\u044C: >+htmlManagerServlet.jvmMaxMemory=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u043F\u0430\u043C\u044F\u0442\u0438: >+htmlManagerServlet.jvmTotalMemory=\u0412\u0441\u044F \u043F\u0430\u043C\u044F\u0442\u044C: >+htmlManagerServlet.jvmTableTitleMemoryPool=\u041E\u0431\u043B\u0430\u0441\u0442\u0438 \u043F\u0430\u043C\u044F\u0442\u0438 >+htmlManagerServlet.jvmTableTitleType=\u0422\u0438\u043F >+htmlManagerServlet.jvmTableTitleInitial=\u0418\u0437\u043D\u0430\u0447\u0430\u043B\u044C\u043D\u043E >+htmlManagerServlet.jvmTableTitleTotal=\u0412\u0441\u0435\u0433\u043E >+htmlManagerServlet.jvmTableTitleMaximum=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C >+htmlManagerServlet.jvmTableTitleUsed=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F >+htmlManagerServlet.connectorStateMaxThreads=\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432: >+htmlManagerServlet.connectorStateThreadCount=\u041D\u044B\u043D\u0435\u0448\u043D\u0435\u0435 \u0447\u0438\u0441\u043B\u043E \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432: >+htmlManagerServlet.connectorStateThreadBusy=\u041D\u044B\u043D\u0435\u0448\u043D\u0435\u0435 \u0447\u0438\u0441\u043B\u043E \u0437\u0430\u043D\u044F\u0442\u044B\u0445 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0432: >+htmlManagerServlet.connectorStateAliveSocketCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0432\u0441\u0451 \u0435\u0449\u0451 \u0436\u0438\u0432\u044B\u0445 \u0441\u043E\u043A\u0435\u0442\u043E\u0432: >+htmlManagerServlet.connectorStateMaxProcessingTime=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u043D\u043E\u0435 \u0432\u0440\u0435\u043C\u044F: >+htmlManagerServlet.connectorStateProcessingTime=\u041F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u043D\u043E\u0435 \u0432\u0440\u0435\u043C\u044F: >+htmlManagerServlet.connectorStateRequestCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432: >+htmlManagerServlet.connectorStateErrorCount=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043E\u0448\u0438\u0431\u043E\u043A: >+htmlManagerServlet.connectorStateBytesRecieved=\u0411\u0430\u0439\u0442\u043E\u0432 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043E: >+htmlManagerServlet.connectorStateBytesSent=\u0411\u0430\u0439\u0442\u043E\u0432 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E: >+htmlManagerServlet.connectorStateTableTittleStage=\u042D\u0442\u0430\u043F >+htmlManagerServlet.connectorStateTableTittleTime=\u0412\u0440\u0435\u043C\u044F >+htmlManagerServlet.connectorStateTableTittleBSent=\u0411 \u041E\u0442\u043F\u0440\u0432\u043B\u0435\u043D\u043E >+htmlManagerServlet.connectorStateTableTittleBRecv=\u0411 \u041F\u043E\u043B\u0443\u0447\u0435\u043D\u043E >+htmlManagerServlet.connectorStateTableTittleClientForw=\u041A\u043B\u0438\u0435\u043D\u0442 (\u041E\u0442\u043E\u0441\u043B\u0430\u043D\u044B\u0439) >+htmlManagerServlet.connectorStateTableTittleClientAct=\u041A\u043B\u0438\u0435\u043D\u0442 (\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439) >+htmlManagerServlet.connectorStateTableTittleVHost=\u0412\u0425\u043E\u0441\u0442 >+htmlManagerServlet.connectorStateTableTittleRequest=\u0417\u0430\u043F\u0440\u043E\u0441\u044B >+htmlManagerServlet.connectorStateHint=P: \u0420\u0430\u0437\u0431\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u0438 \u0433\u043E\u0442\u043E\u0432\u0438\u0442\u0441\u044F \u043A \u043E\u0442\u043F\u0440\u0430\u0432\u043A\u0438 S: \u0421\u0435\u0440\u0432\u0438\u0441 F: \u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u0435 R: \u0413\u043E\u0442\u043E\u0432 K: \u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C >Index: java/org/apache/catalina/manager/StatusManagerServlet.java >=================================================================== >--- java/org/apache/catalina/manager/StatusManagerServlet.java (revision 1838517) >+++ java/org/apache/catalina/manager/StatusManagerServlet.java (working copy) >@@ -283,20 +283,59 @@ > try { > > // Display operating system statistics using APR if available >- StatusTransformer.writeOSState(writer,mode); >+ args = new Object[7]; >+ args[0] = sm.getString("htmlManagerServlet.osPhysicalMemory"); >+ args[1] = sm.getString("htmlManagerServlet.osAvailableMemory"); >+ args[2] = sm.getString("htmlManagerServlet.osTotalPageFile"); >+ args[3] = sm.getString("htmlManagerServlet.osFreePageFile"); >+ args[4] = sm.getString("htmlManagerServlet.osMemoryLoad"); >+ args[5] = sm.getString("htmlManagerServlet.osKernelTime"); >+ args[6] = sm.getString("htmlManagerServlet.osUserTime"); >+ StatusTransformer.writeOSState(writer, mode, args); > > // Display virtual machine statistics >- StatusTransformer.writeVMState(writer,mode); >+ args = new Object[9]; >+ args[0] = sm.getString("htmlManagerServlet.jvmFreeMemory"); >+ args[1] = sm.getString("htmlManagerServlet.jvmTotalMemory"); >+ args[2] = sm.getString("htmlManagerServlet.jvmMaxMemory"); >+ args[3] = sm.getString("htmlManagerServlet.jvmTableTitleMemoryPool"); >+ args[4] = sm.getString("htmlManagerServlet.jvmTableTitleType"); >+ args[5] = sm.getString("htmlManagerServlet.jvmTableTitleInitial"); >+ args[6] = sm.getString("htmlManagerServlet.jvmTableTitleTotal"); >+ args[7] = sm.getString("htmlManagerServlet.jvmTableTitleMaximum"); >+ args[8] = sm.getString("htmlManagerServlet.jvmTableTitleUsed"); >+ // use StatusTransformer to output status >+ StatusTransformer.writeVMState(writer,mode, args); > > Enumeration<ObjectName> enumeration = threadPools.elements(); > while (enumeration.hasMoreElements()) { > ObjectName objectName = enumeration.nextElement(); > String name = objectName.getKeyProperty("name"); >+ args = new Object[19]; >+ args[0] = sm.getString("htmlManagerServlet.connectorStateMaxThreads"); >+ args[1] = sm.getString("htmlManagerServlet.connectorStateThreadCount"); >+ args[2] = sm.getString("htmlManagerServlet.connectorStateThreadBusy"); >+ args[3] = sm.getString("htmlManagerServlet.connectorStateAliveSocketCount"); >+ args[4] = sm.getString("htmlManagerServlet.connectorStateMaxProcessingTime"); >+ args[5] = sm.getString("htmlManagerServlet.connectorStateProcessingTime"); >+ args[6] = sm.getString("htmlManagerServlet.connectorStateRequestCount"); >+ args[7] = sm.getString("htmlManagerServlet.connectorStateErrorCount"); >+ args[8] = sm.getString("htmlManagerServlet.connectorStateBytesRecieved"); >+ args[9] = sm.getString("htmlManagerServlet.connectorStateBytesSent"); >+ args[10] = sm.getString("htmlManagerServlet.connectorStateTableTittleStage"); >+ args[11] = sm.getString("htmlManagerServlet.connectorStateTableTittleTime"); >+ args[12] = sm.getString("htmlManagerServlet.connectorStateTableTittleBSent"); >+ args[13] = sm.getString("htmlManagerServlet.connectorStateTableTittleBRecv"); >+ args[14] = sm.getString("htmlManagerServlet.connectorStateTableTittleClientForw"); >+ args[15] = sm.getString("htmlManagerServlet.connectorStateTableTittleClientAct"); >+ args[16] = sm.getString("htmlManagerServlet.connectorStateTableTittleVHost"); >+ args[17] = sm.getString("htmlManagerServlet.connectorStateTableTittleRequest"); >+ args[18] = sm.getString("htmlManagerServlet.connectorStateHint"); > // use StatusTransformer to output status > StatusTransformer.writeConnectorState > (writer, objectName, > name, mBeanServer, globalRequestProcessors, >- requestProcessors, mode); >+ requestProcessors, mode, args); > } > > if ((request.getPathInfo() != null) >Index: java/org/apache/catalina/manager/StatusTransformer.java >=================================================================== >--- java/org/apache/catalina/manager/StatusTransformer.java (revision 1838517) >+++ java/org/apache/catalina/manager/StatusTransformer.java (working copy) >@@ -149,7 +149,7 @@ > * @param mode Mode <code>0</code> will generate HTML. > * Mode <code>1</code> will generate XML. > */ >- public static void writeOSState(PrintWriter writer, int mode) { >+ public static void writeOSState(PrintWriter writer, int mode, Object[] args) { > long[] result = new long[16]; > boolean ok = false; > try { >@@ -172,20 +172,20 @@ > writer.print("<h1>OS</h1>"); > > writer.print("<p>"); >- writer.print(" Physical memory: "); >+ writer.print( args[0] ); > writer.print(formatSize(Long.valueOf(result[0]), true)); >- writer.print(" Available memory: "); >+ writer.print(" " + args[1]); > writer.print(formatSize(Long.valueOf(result[1]), true)); >- writer.print(" Total page file: "); >+ writer.print(" " + args[2]); > writer.print(formatSize(Long.valueOf(result[2]), true)); >- writer.print(" Free page file: "); >+ writer.print(" " + args[3]); > writer.print(formatSize(Long.valueOf(result[3]), true)); >- writer.print(" Memory load: "); >+ writer.print(" " + args[4]); > writer.print(Long.valueOf(result[6])); > writer.print("<br>"); >- writer.print(" Process kernel time: "); >+ writer.print(" " + args[5]); > writer.print(formatTime(Long.valueOf(result[11] / 1000), true)); >- writer.print(" Process user time: "); >+ writer.print(" " + args[6]); > writer.print(formatTime(Long.valueOf(result[12] / 1000), true)); > writer.print("</p>"); > } else if (mode == 1){ >@@ -203,7 +203,7 @@ > * Mode <code>1</code> will generate XML. > * @throws Exception Propagated JMX error > */ >- public static void writeVMState(PrintWriter writer, int mode) >+ public static void writeVMState(PrintWriter writer, int mode, Object[] args) > throws Exception { > > SortedMap<String, MemoryPoolMXBean> memoryPoolMBeans = new TreeMap<>(); >@@ -216,18 +216,18 @@ > writer.print("<h1>JVM</h1>"); > > writer.print("<p>"); >- writer.print(" Free memory: "); >+ writer.print( args[0] ); > writer.print(formatSize( > Long.valueOf(Runtime.getRuntime().freeMemory()), true)); >- writer.print(" Total memory: "); >+ writer.print(" " + args[1] ); > writer.print(formatSize( > Long.valueOf(Runtime.getRuntime().totalMemory()), true)); >- writer.print(" Max memory: "); >+ writer.print(" " + args[2] ); > writer.print(formatSize( > Long.valueOf(Runtime.getRuntime().maxMemory()), true)); > writer.print("</p>"); > >- writer.write("<table border=\"0\"><thead><tr><th>Memory Pool</th><th>Type</th><th>Initial</th><th>Total</th><th>Maximum</th><th>Used</th></tr></thead><tbody>"); >+ writer.write("<table border=\"0\"><thead><tr><th>" + args[3] + "</th><th>" + args[4] + "</th><th>" + args[5] + "</th><th>" + args[6] + "</th><th>" + args[7] + "</th><th>" + args[8] + "</th></tr></thead><tbody>"); > for (MemoryPoolMXBean memoryPoolMBean : memoryPoolMBeans.values()) { > MemoryUsage usage = memoryPoolMBean.getUsage(); > writer.write("<tr><td>"); >@@ -289,7 +289,7 @@ > public static void writeConnectorState(PrintWriter writer, > ObjectName tpName, String name, MBeanServer mBeanServer, > Vector<ObjectName> globalRequestProcessors, >- Vector<ObjectName> requestProcessors, int mode) throws Exception { >+ Vector<ObjectName> requestProcessors, int mode, Object[] args) throws Exception { > > if (mode == 0) { > writer.print("<h1>"); >@@ -297,15 +297,15 @@ > writer.print("</h1>"); > > writer.print("<p>"); >- writer.print(" Max threads: "); >+ writer.print( args[0] ); > writer.print(mBeanServer.getAttribute(tpName, "maxThreads")); >- writer.print(" Current thread count: "); >+ writer.print(" " + args[1]); > writer.print(mBeanServer.getAttribute(tpName, "currentThreadCount")); >- writer.print(" Current thread busy: "); >+ writer.print(" " + args[2]); > writer.print(mBeanServer.getAttribute(tpName, "currentThreadsBusy")); > try { > Object value = mBeanServer.getAttribute(tpName, "keepAliveCount"); >- writer.print(" Keep alive sockets count: "); >+ writer.print(" " + args[3]); > writer.print(value); > } catch (Exception e) { > // Ignore >@@ -328,25 +328,25 @@ > return; > } > >- writer.print(" Max processing time: "); >+ writer.print( args[4] ); > writer.print(formatTime(mBeanServer.getAttribute > (grpName, "maxTime"), false)); >- writer.print(" Processing time: "); >+ writer.print(" " + args[5]); > writer.print(formatTime(mBeanServer.getAttribute > (grpName, "processingTime"), true)); >- writer.print(" Request count: "); >+ writer.print(" " + args[6]); > writer.print(mBeanServer.getAttribute(grpName, "requestCount")); >- writer.print(" Error count: "); >+ writer.print(" " + args[7]); > writer.print(mBeanServer.getAttribute(grpName, "errorCount")); >- writer.print(" Bytes received: "); >+ writer.print(" " + args[8]); > writer.print(formatSize(mBeanServer.getAttribute > (grpName, "bytesReceived"), true)); >- writer.print(" Bytes sent: "); >+ writer.print(" " + args[9]); > writer.print(formatSize(mBeanServer.getAttribute > (grpName, "bytesSent"), true)); > writer.print("</p>"); > >- writer.print("<table border=\"0\"><tr><th>Stage</th><th>Time</th><th>B Sent</th><th>B Recv</th><th>Client (Forwarded)</th><th>Client (Actual)</th><th>VHost</th><th>Request</th></tr>"); >+ writer.print("<table border=\"0\"><tr><th>"+ args[10] + "</th><th>" + args[11] + "</th><th>" + args[12] +"</th><th>" + args[13] +"</th><th>" + args[14] + "</th><th>" + args[15] + "</th><th>" + args[16] + "</th><th>" + args[17] + "</th></tr>"); > > enumeration = requestProcessors.elements(); > while (enumeration.hasMoreElements()) { >@@ -361,7 +361,7 @@ > writer.print("</table>"); > > writer.print("<p>"); >- writer.print("P: Parse and prepare request S: Service F: Finishing R: Ready K: Keepalive"); >+ writer.print( args[18] ); > writer.print("</p>"); > } else if (mode == 1){ > writer.write("<connector name='" + name + "'>"); > >Index: webapps/ROOT/index.jsp >=================================================================== >--- webapps/ROOT/index.jsp (revision 1838517) >+++ webapps/ROOT/index.jsp (working copy) >@@ -1,3 +1,8 @@ >+<%@ page import="javax.index.start" %> >+ >+<%@page contentType="text/html;charset=UTF-8" language="java" %> >+ >+ > <%-- > Licensed to the Apache Software Foundation (ASF) under one or more > contributor license agreements. See the NOTICE file distributed with >@@ -14,19 +19,22 @@ > See the License for the specific language governing permissions and > limitations under the License. > --%> >-<%@ page session="false" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> >+ >+ >+ >+ > <!DOCTYPE html> > <html lang="en"> > <head> > <meta charset="UTF-8" /> > <link href="favicon.ico" rel="icon" type="image/x-icon" /> > <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" /> > <link href="tomcat.css" rel="stylesheet" type="text/css" /> >@@ -35,40 +43,42 @@ > <body> > <div id="wrapper"> > <div id="navigation" class="curved container"> >- <span id="nav-home"><a href="${tomcatUrl}">Home</a></span> >- <span id="nav-hosts"><a href="${tomcatDocUrl}">Documentation</a></span> >- <span id="nav-config"><a href="${tomcatDocUrl}config/">Configuration</a></span> >- <span id="nav-examples"><a href="${tomcatExamplesUrl}">Examples</a></span> >- <span id="nav-wiki"><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></span> >- <span id="nav-lists"><a href="${tomcatUrl}lists.html">Mailing Lists</a></span> >- <span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find Help</a></span> >+ <span id="nav-home"><a href="${tomcatUrl}"><%=start.home%></a></span> >+ <span id="nav-hosts"><a href="${tomcatDocUrl}"><%=start.documentation%></a></span> >+ <span id="nav-config"><a href="${tomcatDocUrl}config/"><%=start.configuration%></a></span> >+ <span id="nav-examples"><a href="${tomcatExamplesUrl}"><%=start.examples%></a></span> >+ <span id="nav-wiki"><a href="https://wiki.apache.org/tomcat/FrontPage"><%=start.wiki%></a></span> >+ <span id="nav-lists"><a href="${tomcatUrl}lists.html"><%=start.mail%></a></span> >+ <span id="nav-help"><a href="${tomcatUrl}findhelp.html"><%=start.help%></a></span> > <br class="separator" /> > </div> >- <div id="asf-box"> >+ >+ <div id="asf-box"> > <h1>${pageContext.servletContext.serverInfo}</h1> > </div> > <div id="upper" class="curved container"> > <div id="congrats" class="curved container"> >- <h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2> >+ <h2><%=start.congrats%></h2> > </div> > <div id="notice"> > <img src="tomcat.png" alt="[tomcat logo]" /> > <div id="tasks"> > <h3>Recommended Reading:</h3> >- <h4><a href="${tomcatDocUrl}security-howto.html">Security Considerations HOW-TO</a></h4> >- <h4><a href="${tomcatDocUrl}manager-howto.html">Manager Application HOW-TO</a></h4> >- <h4><a href="${tomcatDocUrl}cluster-howto.html">Clustering/Session Replication HOW-TO</a></h4> >+ <h4><a href="${tomcatDocUrl}security-howto.html"><%=start.security%></a></h4> >+ <h4><a href="${tomcatDocUrl}manager-howto.html"><%=start.manager%></a></h4> >+ <h4><a href="${tomcatDocUrl}cluster-howto.html"><%=start.clustering%></a></h4> > </div> >- </div> >+ </div> >+ > <div id="actions"> > <div class="button"> >- <a class="container shadow" href="/manager/status"><span>Server Status</span></a> >+ <a class="container shadow" href="/manager/status"><span><%=start.status%></span></a> > </div> > <div class="button"> >- <a class="container shadow" href="/manager/html"><span>Manager App</span></a> >+ <a class="container shadow" href="/manager/html"><span><%=start.managerapp%></span></a> > </div> > <div class="button"> >- <a class="container shadow" href="/host-manager/html"><span>Host Manager</span></a> >+ <a class="container shadow" href="/host-manager/html"><span><%=start.server%></span></a> > </div> > </div> > <!-- >@@ -77,28 +87,28 @@ > <br class="separator" /> > </div> > <div id="middle" class="curved container"> >- <h3>Developer Quick Start</h3> >+ <h3><%=start.developer%></h3> > <div class="col25"> > <div class="container"> >- <p><a href="${tomcatDocUrl}setup.html">Tomcat Setup</a></p> >- <p><a href="${tomcatDocUrl}appdev/">First Web Application</a></p> >+ <p><a href="${tomcatDocUrl}setup.html"><span><%=start.setup%></span></a></p> >+ <p><a href="${tomcatDocUrl}appdev/"> <span><%=start.firstapp%></span> </a></p> > </div> > </div> > <div class="col25"> > <div class="container"> > <p><a href="${tomcatDocUrl}realm-howto.html">Realms &amp; AAA</a></p> >- <p><a href="${tomcatDocUrl}jndi-datasource-examples-howto.html">JDBC DataSources</a></p> >+ <p><a href="${tomcatDocUrl}jndi-datasource-examples-howto.html"><span><%=start.data%></span></a></p> > </div> > </div> > <div class="col25"> > <div class="container"> >- <p><a href="${tomcatExamplesUrl}">Examples</a></p> >+ <p><a href="${tomcatExamplesUrl}"><span><%=start.example%></span></a></p> > </div> > </div> > <div class="col25"> > <div class="container"> >- <p><a href="https://wiki.apache.org/tomcat/Specifications">Servlet Specifications</a></p> >- <p><a href="https://wiki.apache.org/tomcat/TomcatVersions">Tomcat Versions</a></p> >+ <p><a href="https://wiki.apache.org/tomcat/Specifications"><span><%=start.servlet%></span></a></p> >+ <p><a href="https://wiki.apache.org/tomcat/TomcatVersions"><span><%=start.versions%></span></a></p> > </div> > </div> > <br class="separator" /> >@@ -106,52 +116,50 @@ > <div id="lower"> > <div id="low-manage" class=""> > <div class="curved container"> >- <h3>Managing Tomcat</h3> >- <p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted. >- Users are defined in:</p> >+ <h3><%=start.managing%></h3> >+ <p><%=start.p1%> <a href="/manager/html"><span><%=start.p2%></span></a><%=start.p3%> </p> > <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre> >- <p>In Tomcat @VERSION_MAJOR_MINOR@ access to the manager application is split between >- different users. &nbsp; <a href="${tomcatDocUrl}manager-howto.html">Read more...</a></p> >+ <p><%=start.access%> &nbsp; <a href="${tomcatDocUrl}manager-howto.html"><span><%=start.rmore%></span></a></p> > <br /> >- <h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt">Release Notes</a></h4> >- <h4><a href="${tomcatDocUrl}changelog.html">Changelog</a></h4> >- <h4><a href="${tomcatUrl}migration.html">Migration Guide</a></h4> >- <h4><a href="${tomcatUrl}security.html">Security Notices</a></h4> >+ <h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt"><span><%=start.releasenotes%></span></a></h4> >+ <h4><a href="${tomcatDocUrl}changelog.html"><span><%=start.changelog%></span></a></h4> >+ <h4><a href="${tomcatUrl}migration.html"><span><%=start.migration%></span></a></h4> >+ <h4><a href="${tomcatUrl}security.html"><span><%=start.securitynotes%></span></a></h4> > </div> > </div> > <div id="low-docs" class=""> > <div class="curved container"> >- <h3>Documentation</h3> >- <h4><a href="${tomcatDocUrl}">Tomcat @VERSION_MAJOR_MINOR@ Documentation</a></h4> >- <h4><a href="${tomcatDocUrl}config/">Tomcat @VERSION_MAJOR_MINOR@ Configuration</a></h4> >- <h4><a href="https://wiki.apache.org/tomcat/FrontPage">Tomcat Wiki</a></h4> >- <p>Find additional important configuration information in:</p> >+ <h3><%=start.Hdocumentation%></h3> >+ <h4><a href="${tomcatDocUrl}"><span><%=start.tversion%></span></a></h4> >+ <h4><a href="${tomcatDocUrl}config/"><span><%=start.tconfiguration%></span></a></h4> >+ <h4><a href="https://wiki.apache.org/tomcat/FrontPage"><span><%=start.twiki%></span></a></h4> >+ <p><%--=start.tfind--%></p> > <pre>$CATALINA_HOME/RUNNING.txt</pre> >- <p>Developers may be interested in:</p> >+ <p><%--=start.dev--%></p> > <ul> >- <li><a href="https://tomcat.apache.org/bugreport.html">Tomcat @VERSION_MAJOR_MINOR@ Bug Database</a></li> >+ <li><a href="https://tomcat.apache.org/bugreport.html"><span><%=start.bugs%></span></a></li> > <li><a href="${tomcatDocUrl}api/index.html">Tomcat @VERSION_MAJOR_MINOR@ JavaDocs</a></li> >- <li><a href="https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/">Tomcat @VERSION_MAJOR_MINOR@ SVN Repository</a></li> >+ <li><a href="https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/"><span><%=start.rep%></span></a></li> > </ul> > </div> > </div> > <div id="low-help" class=""> > <div class="curved container"> >- <h3>Getting Help</h3> >- <h4><a href="${tomcatUrl}faq/">FAQ</a> and <a href="${tomcatUrl}lists.html">Mailing Lists</a></h4> >- <p>The following mailing lists are available:</p> >+ <h3><%=start.gethelp%></h3> >+ <h4><a href="${tomcatUrl}faq/"><span><%=start.faq%></span></a> <%=start.and %><a href="${tomcatUrl}lists.html"><span><%=start.maillist%></span></a></h4> >+ <p><%=start.avlists%></p> > <ul> > <li id="list-announce"><strong><a href="${tomcatUrl}lists.html#tomcat-announce">tomcat-announce</a><br /> >- Important announcements, releases, security vulnerability notifications. (Low volume).</strong> >+ <span><%=start.list1%></span></strong> > </li> > <li><a href="${tomcatUrl}lists.html#tomcat-users">tomcat-users</a><br /> >- User support and discussion >+ <span><%=start.list2%></span> > </li> > <li><a href="${tomcatUrl}lists.html#taglibs-user">taglibs-user</a><br /> >- User support and discussion for <a href="${tomcatUrl}taglibs/">Apache Taglibs</a> >+ <span><%=start.list2%></span> <a href="${tomcatUrl}taglibs/"> <span><%=start.list3%></span></a> > </li> > <li><a href="${tomcatUrl}lists.html#tomcat-dev">tomcat-dev</a><br /> >- Development mailing list, including commit messages >+ <span><%=start.list4%></span> > </li> > </ul> > </div> >@@ -161,56 +169,56 @@ > <div id="footer" class="curved container"> > <div class="col20"> > <div class="container"> >- <h4>Other Downloads</h4> >+ <h4><%= start.downloads %></h4> > <ul> >- <li><a href="${tomcatUrl}download-connectors.cgi">Tomcat Connectors</a></li> >- <li><a href="${tomcatUrl}download-native.cgi">Tomcat Native</a></li> >- <li><a href="${tomcatUrl}taglibs/">Taglibs</a></li> >- <li><a href="${tomcatDocUrl}deployer-howto.html">Deployer</a></li> >+ <li><a href="${tomcatUrl}download-connectors.cgi"><span><%= start.connectors %></span></a></li> >+ <li><a href="${tomcatUrl}download-native.cgi"><span><%= start.natives %></span></a></li> >+ <li><a href="${tomcatUrl}taglibs/"><span><%= start.taglibs %></span></a></li> >+ <li><a href="${tomcatDocUrl}deployer-howto.html"><span><%= start.deployer %></span></a></li> > </ul> > </div> > </div> > <div class="col20"> > <div class="container"> >- <h4>Other Documentation</h4> >+ <h4><%= start.otherdoc %></h4> > <ul> >- <li><a href="${tomcatUrl}connectors-doc/">Tomcat Connectors</a></li> >- <li><a href="${tomcatUrl}connectors-doc/">mod_jk Documentation</a></li> >- <li><a href="${tomcatUrl}native-doc/">Tomcat Native</a></li> >- <li><a href="${tomcatDocUrl}deployer-howto.html">Deployer</a></li> >+ <li><a href="${tomcatUrl}connectors-doc/"><span><%= start.connectors %></span></a></li> >+ <li><a href="${tomcatUrl}connectors-doc/"><span><%= start.modjk %></span></a></li> >+ <li><a href="${tomcatUrl}native-doc/"><span><%= start.natives %></span></a></li> >+ <li><a href="${tomcatDocUrl}deployer-howto.html"><span><%= start.deployer %></span></a></li> > </ul> > </div> > </div> > <div class="col20"> > <div class="container"> >- <h4>Get Involved</h4> >+ <h4><%= start.getinvolved %></h4> > <ul> >- <li><a href="${tomcatUrl}getinvolved.html">Overview</a></li> >- <li><a href="${tomcatUrl}svn.html">SVN Repositories</a></li> >- <li><a href="${tomcatUrl}lists.html">Mailing Lists</a></li> >- <li><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></li> >+ <li><a href="${tomcatUrl}getinvolved.html"><span><%= start.overview %></span></a></li> >+ <li><a href="${tomcatUrl}svn.html"><span><%= start.repositories %></span></a></li> >+ <li><a href="${tomcatUrl}lists.html"><span><%= start.maillist %></span></a></li> >+ <li><a href="https://wiki.apache.org/tomcat/FrontPage"><span><%= start.wiki %></span></a></li> > </ul> > </div> > </div> > <div class="col20"> > <div class="container"> >- <h4>Miscellaneous</h4> >+ <h4><%= start.other %></h4> > <ul> >- <li><a href="${tomcatUrl}contact.html">Contact</a></li> >- <li><a href="${tomcatUrl}legal.html">Legal</a></li> >- <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li> >- <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li> >+ <li><a href="${tomcatUrl}contact.html"><span><%= start.contact %></span></a></li> >+ <li><a href="${tomcatUrl}legal.html"><span><%= start.legal %></span></a></li> >+ <li><a href="https://www.apache.org/foundation/sponsorship.html"><span><%= start.sponsorship %></span></a></li> >+ <li><a href="https://www.apache.org/foundation/thanks.html"><span><%= start.thanks %></span></a></li> > </ul> > </div> > </div> > <div class="col20"> > <div class="container"> >- <h4>Apache Software Foundation</h4> >+ <h4><%= start.apachefound %></h4> > <ul> >- <li><a href="${tomcatUrl}whoweare.html">Who We Are</a></li> >- <li><a href="${tomcatUrl}heritage.html">Heritage</a></li> >- <li><a href="https://www.apache.org">Apache Home</a></li> >- <li><a href="${tomcatUrl}resources.html">Resources</a></li> >+ <li><a href="${tomcatUrl}whoweare.html"><span><%= start.whoweare %></span></a></li> >+ <li><a href="${tomcatUrl}heritage.html"><span><%= start.heritage %></span></a></li> >+ <li><a href="https://www.apache.org"><span><%= start.apachehome %></span></a></li> >+ <li><a href="${tomcatUrl}resources.html"><span><%= start.resources %></span></a></li> > </ul> > </div> > </div> View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]