Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

V.9-09/04/2012

  • Loading branch information...
commit a52e0f77f400ab3b4c529530fa68af6c7ee16b60 1 parent ea37454
@ngasiproj authored
Showing with 7,493 additions and 7,480 deletions.
  1. +1,049 −1,049 LICENSE
  2. +36 −36 NOTICE
  3. +111 −111 README
  4. +228 −228 RELEASE-NOTES
  5. +289 −289 RUNNING.txt
  6. +61 −61 bin/catalina-tasks.xml
  7. +323 −323 bin/catalina.bat
  8. +9 −0 bin/catalina.sh
  9. +59 −59 bin/configtest.bat
  10. +35 −35 bin/cpappend.bat
  11. +2 −2 bin/derby.log
  12. +59 −59 bin/digest.bat
  13. +88 −88 bin/setclasspath.bat
  14. +2 −1  bin/setenv.sh
  15. +59 −59 bin/shutdown.bat
  16. +97 −97 bin/tool-wrapper.bat
  17. +59 −59 bin/version.bat
  18. +246 −246 conf/catalina.policy
  19. +119 −119 conf/catalina.properties
  20. +34 −34 conf/context.xml
  21. +64 −64 conf/logging.properties
  22. +145 −142 conf/server.xml
  23. +36 −36 conf/tomcat-users.xml
  24. +4,283 −4,283 conf/web.xml
  25. 0  jdk/COPYRIGHT
  26. 0  jdk/README.html
  27. 0  jdk/README_ja.html
  28. 0  jdk/README_zh_CN.html
  29. 0  jdk/THIRDPARTYLICENSEREADME.txt
  30. 0  jdk/include/classfile_constants.h
  31. 0  jdk/include/jawt.h
  32. 0  jdk/include/jdwpTransport.h
  33. 0  jdk/include/jni.h
  34. 0  jdk/include/jvmti.h
  35. 0  jdk/include/linux/jawt_md.h
  36. 0  jdk/include/linux/jni_md.h
  37. 0  jdk/jre/COPYRIGHT
  38. 0  jdk/jre/README
  39. 0  jdk/jre/THIRDPARTYLICENSEREADME.txt
  40. 0  jdk/jre/Welcome.html
  41. 0  jdk/jre/lib/alt-rt.jar
  42. 0  jdk/jre/lib/alt-string.jar
  43. 0  jdk/jre/lib/audio/soundbank.gm
  44. 0  jdk/jre/lib/calendars.properties
  45. 0  jdk/jre/lib/charsets.jar
  46. 0  jdk/jre/lib/classlist
  47. 0  jdk/jre/lib/cmm/CIEXYZ.pf
  48. 0  jdk/jre/lib/cmm/GRAY.pf
  49. 0  jdk/jre/lib/cmm/LINEAR_RGB.pf
  50. 0  jdk/jre/lib/cmm/PYCC.pf
  51. 0  jdk/jre/lib/cmm/sRGB.pf
  52. 0  jdk/jre/lib/content-types.properties
  53. 0  jdk/jre/lib/deploy.jar
  54. 0  jdk/jre/lib/deploy/java-icon.ico
  55. 0  jdk/jre/lib/deploy/messages.properties
  56. 0  jdk/jre/lib/deploy/messages_de.properties
  57. 0  jdk/jre/lib/deploy/messages_es.properties
  58. 0  jdk/jre/lib/deploy/messages_fr.properties
  59. 0  jdk/jre/lib/deploy/messages_it.properties
  60. 0  jdk/jre/lib/deploy/messages_ja.properties
  61. 0  jdk/jre/lib/deploy/messages_ko.properties
  62. 0  jdk/jre/lib/deploy/messages_pt_BR.properties
  63. 0  jdk/jre/lib/deploy/messages_sv.properties
  64. 0  jdk/jre/lib/deploy/messages_zh_CN.properties
  65. 0  jdk/jre/lib/deploy/messages_zh_TW.properties
  66. 0  jdk/jre/lib/deploy/splash.gif
  67. 0  jdk/jre/lib/desktop/applications/sun-java.desktop
  68. 0  jdk/jre/lib/desktop/applications/sun-javaws.desktop
  69. 0  jdk/jre/lib/desktop/applications/sun_java.desktop
  70. 0  jdk/jre/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png
  71. 0  jdk/jre/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png
  72. 0  jdk/jre/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png
  73. 0  jdk/jre/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png
  74. 0  jdk/jre/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  75. 0  jdk/jre/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png
  76. 0  jdk/jre/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png
  77. 0  jdk/jre/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png
  78. 0  jdk/jre/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png
  79. 0  jdk/jre/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png
  80. 0  jdk/jre/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  81. 0  jdk/jre/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png
  82. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png
  83. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png
  84. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png
  85. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png
  86. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  87. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png
  88. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png
  89. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png
  90. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png
  91. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png
  92. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  93. 0  jdk/jre/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png
  94. 0  jdk/jre/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png
  95. 0  jdk/jre/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png
  96. 0  jdk/jre/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png
  97. 0  jdk/jre/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png
  98. 0  jdk/jre/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  99. 0  jdk/jre/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png
  100. 0  jdk/jre/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png
  101. 0  jdk/jre/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png
  102. 0  jdk/jre/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png
  103. 0  jdk/jre/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png
  104. 0  jdk/jre/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  105. 0  jdk/jre/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png
  106. 0  jdk/jre/lib/desktop/icons/hicolor/16x16/apps/sun-java.png
  107. 0  jdk/jre/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png
  108. 0  jdk/jre/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png
  109. 0  jdk/jre/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png
  110. 0  jdk/jre/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  111. 0  jdk/jre/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png
  112. 0  jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png
  113. 0  jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png
  114. 0  jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png
  115. 0  jdk/jre/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png
  116. 0  jdk/jre/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png
  117. 0  jdk/jre/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png
  118. 0  jdk/jre/lib/desktop/mime/packages/x-java-archive.xml
  119. 0  jdk/jre/lib/desktop/mime/packages/x-java-jnlp-file.xml
  120. 0  jdk/jre/lib/ext/dnsns.jar
  121. 0  jdk/jre/lib/ext/localedata.jar
  122. 0  jdk/jre/lib/ext/meta-index
  123. 0  jdk/jre/lib/ext/sunjce_provider.jar
  124. 0  jdk/jre/lib/ext/sunpkcs11.jar
  125. 0  jdk/jre/lib/flavormap.properties
  126. 0  jdk/jre/lib/fontconfig.RedHat.2.1.bfc
  127. 0  jdk/jre/lib/fontconfig.RedHat.2.1.properties.src
  128. 0  jdk/jre/lib/fontconfig.RedHat.3.bfc
  129. 0  jdk/jre/lib/fontconfig.RedHat.3.properties.src
  130. 0  jdk/jre/lib/fontconfig.RedHat.4.bfc
  131. 0  jdk/jre/lib/fontconfig.RedHat.4.properties.src
  132. 0  jdk/jre/lib/fontconfig.RedHat.bfc
  133. 0  jdk/jre/lib/fontconfig.RedHat.properties.src
  134. 0  jdk/jre/lib/fontconfig.SuSE.11.bfc
  135. 0  jdk/jre/lib/fontconfig.SuSE.11.properties.src
  136. 0  jdk/jre/lib/fontconfig.SuSE.bfc
  137. 0  jdk/jre/lib/fontconfig.SuSE.properties.src
  138. 0  jdk/jre/lib/fontconfig.Sun.bfc
  139. 0  jdk/jre/lib/fontconfig.Sun.properties.src
  140. 0  jdk/jre/lib/fontconfig.Turbo.bfc
  141. 0  jdk/jre/lib/fontconfig.Turbo.properties.src
  142. 0  jdk/jre/lib/fontconfig.Ubuntu.bfc
  143. 0  jdk/jre/lib/fontconfig.Ubuntu.properties.src
  144. 0  jdk/jre/lib/fontconfig.bfc
  145. 0  jdk/jre/lib/fontconfig.properties.src
  146. 0  jdk/jre/lib/fonts/LucidaBrightDemiBold.ttf
  147. 0  jdk/jre/lib/fonts/LucidaBrightDemiItalic.ttf
  148. 0  jdk/jre/lib/fonts/LucidaBrightItalic.ttf
  149. 0  jdk/jre/lib/fonts/LucidaBrightRegular.ttf
  150. 0  jdk/jre/lib/fonts/LucidaSansDemiBold.ttf
  151. 0  jdk/jre/lib/fonts/LucidaSansRegular.ttf
  152. 0  jdk/jre/lib/fonts/LucidaTypewriterBold.ttf
  153. 0  jdk/jre/lib/fonts/LucidaTypewriterRegular.ttf
  154. 0  jdk/jre/lib/fonts/fonts.dir
  155. 0  jdk/jre/lib/i386/client/Xusage.txt
  156. 0  jdk/jre/lib/i386/client/classes.jsa
  157. 0  jdk/jre/lib/i386/jvm.cfg
  158. 0  jdk/jre/lib/i386/libnative_chmod.so
  159. 0  jdk/jre/lib/i386/libnative_chmod_g.so
  160. 0  jdk/jre/lib/i386/server/Xusage.txt
  161. 0  jdk/jre/lib/im/indicim.jar
  162. 0  jdk/jre/lib/im/thaiim.jar
  163. 0  jdk/jre/lib/images/cursors/cursors.properties
  164. 0  jdk/jre/lib/images/cursors/invalid32x32.gif
  165. 0  jdk/jre/lib/images/cursors/motif_CopyDrop32x32.gif
  166. 0  jdk/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
  167. 0  jdk/jre/lib/images/cursors/motif_LinkDrop32x32.gif
  168. 0  jdk/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
  169. 0  jdk/jre/lib/images/cursors/motif_MoveDrop32x32.gif
  170. 0  jdk/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
  171. 0  jdk/jre/lib/images/icons/sun-java.png
  172. 0  jdk/jre/lib/images/icons/sun-java_HighContrast.png
  173. 0  jdk/jre/lib/images/icons/sun-java_HighContrastInverse.png
  174. 0  jdk/jre/lib/images/icons/sun-java_LowContrast.png
  175. 0  jdk/jre/lib/javaws.jar
  176. 0  jdk/jre/lib/jce.jar
  177. 0  jdk/jre/lib/jsse.jar
  178. 0  jdk/jre/lib/jvm.hprof.txt
  179. 0  jdk/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
  180. 0  jdk/jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
  181. 0  jdk/jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
  182. 0  jdk/jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
  183. 0  jdk/jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
  184. 0  jdk/jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
  185. 0  jdk/jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
  186. 0  jdk/jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
  187. 0  jdk/jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
  188. 0  jdk/jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
  189. 0  jdk/jre/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo
  190. 0  jdk/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
  191. 0  jdk/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
  192. 0  jdk/jre/lib/logging.properties
  193. 0  jdk/jre/lib/management-agent.jar
  194. 0  jdk/jre/lib/management/jmxremote.access
  195. 0  jdk/jre/lib/management/jmxremote.password.template
  196. 0  jdk/jre/lib/management/management.properties
  197. 0  jdk/jre/lib/management/snmp.acl.template
  198. 0  jdk/jre/lib/meta-index
  199. 0  jdk/jre/lib/net.properties
  200. 0  jdk/jre/lib/oblique-fonts/LucidaSansDemiOblique.ttf
  201. 0  jdk/jre/lib/oblique-fonts/LucidaSansOblique.ttf
  202. 0  jdk/jre/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf
  203. 0  jdk/jre/lib/oblique-fonts/LucidaTypewriterOblique.ttf
  204. 0  jdk/jre/lib/oblique-fonts/fonts.dir
  205. 0  jdk/jre/lib/plugin.jar
  206. 0  jdk/jre/lib/psfont.properties.ja
  207. 0  jdk/jre/lib/psfontj2d.properties
  208. 0  jdk/jre/lib/resources.jar
  209. 0  jdk/jre/lib/rt.jar
  210. 0  jdk/jre/lib/security/US_export_policy.jar
  211. 0  jdk/jre/lib/security/blacklist
  212. 0  jdk/jre/lib/security/cacerts
  213. 0  jdk/jre/lib/security/java.policy
  214. 0  jdk/jre/lib/security/java.security
  215. 0  jdk/jre/lib/security/javaws.policy
  216. 0  jdk/jre/lib/security/local_policy.jar
  217. 0  jdk/jre/lib/security/trusted.libraries
  218. 0  jdk/jre/lib/servicetag/jdk_header.png
  219. 0  jdk/jre/lib/servicetag/registration.xml
  220. 0  jdk/jre/lib/sound.properties
  221. 0  jdk/jre/lib/zi/Africa/Abidjan
  222. 0  jdk/jre/lib/zi/Africa/Accra
  223. 0  jdk/jre/lib/zi/Africa/Addis_Ababa
  224. 0  jdk/jre/lib/zi/Africa/Algiers
  225. 0  jdk/jre/lib/zi/Africa/Asmara
  226. 0  jdk/jre/lib/zi/Africa/Bamako
  227. 0  jdk/jre/lib/zi/Africa/Bangui
  228. 0  jdk/jre/lib/zi/Africa/Banjul
  229. 0  jdk/jre/lib/zi/Africa/Bissau
  230. 0  jdk/jre/lib/zi/Africa/Blantyre
  231. 0  jdk/jre/lib/zi/Africa/Brazzaville
  232. 0  jdk/jre/lib/zi/Africa/Bujumbura
  233. 0  jdk/jre/lib/zi/Africa/Cairo
  234. 0  jdk/jre/lib/zi/Africa/Casablanca
  235. 0  jdk/jre/lib/zi/Africa/Ceuta
  236. 0  jdk/jre/lib/zi/Africa/Conakry
  237. 0  jdk/jre/lib/zi/Africa/Dakar
  238. 0  jdk/jre/lib/zi/Africa/Dar_es_Salaam
  239. 0  jdk/jre/lib/zi/Africa/Djibouti
  240. 0  jdk/jre/lib/zi/Africa/Douala
  241. 0  jdk/jre/lib/zi/Africa/El_Aaiun
  242. 0  jdk/jre/lib/zi/Africa/Freetown
  243. 0  jdk/jre/lib/zi/Africa/Gaborone
  244. 0  jdk/jre/lib/zi/Africa/Harare
  245. 0  jdk/jre/lib/zi/Africa/Johannesburg
  246. 0  jdk/jre/lib/zi/Africa/Kampala
  247. 0  jdk/jre/lib/zi/Africa/Khartoum
  248. 0  jdk/jre/lib/zi/Africa/Kigali
  249. 0  jdk/jre/lib/zi/Africa/Kinshasa
  250. 0  jdk/jre/lib/zi/Africa/Lagos
  251. 0  jdk/jre/lib/zi/Africa/Libreville
  252. 0  jdk/jre/lib/zi/Africa/Lome
  253. 0  jdk/jre/lib/zi/Africa/Luanda
  254. 0  jdk/jre/lib/zi/Africa/Lubumbashi
  255. 0  jdk/jre/lib/zi/Africa/Lusaka
  256. 0  jdk/jre/lib/zi/Africa/Malabo
  257. 0  jdk/jre/lib/zi/Africa/Maputo
  258. 0  jdk/jre/lib/zi/Africa/Maseru
  259. 0  jdk/jre/lib/zi/Africa/Mbabane
  260. 0  jdk/jre/lib/zi/Africa/Mogadishu
  261. 0  jdk/jre/lib/zi/Africa/Monrovia
  262. 0  jdk/jre/lib/zi/Africa/Nairobi
  263. 0  jdk/jre/lib/zi/Africa/Ndjamena
  264. 0  jdk/jre/lib/zi/Africa/Niamey
  265. 0  jdk/jre/lib/zi/Africa/Nouakchott
  266. 0  jdk/jre/lib/zi/Africa/Ouagadougou
  267. 0  jdk/jre/lib/zi/Africa/Porto-Novo
  268. 0  jdk/jre/lib/zi/Africa/Sao_Tome
  269. 0  jdk/jre/lib/zi/Africa/Tripoli
  270. 0  jdk/jre/lib/zi/Africa/Tunis
  271. 0  jdk/jre/lib/zi/Africa/Windhoek
  272. 0  jdk/jre/lib/zi/America/Adak
  273. 0  jdk/jre/lib/zi/America/Anchorage
  274. 0  jdk/jre/lib/zi/America/Anguilla
  275. 0  jdk/jre/lib/zi/America/Antigua
  276. 0  jdk/jre/lib/zi/America/Araguaina
  277. 0  jdk/jre/lib/zi/America/Argentina/Buenos_Aires
  278. 0  jdk/jre/lib/zi/America/Argentina/Catamarca
  279. 0  jdk/jre/lib/zi/America/Argentina/Cordoba
  280. 0  jdk/jre/lib/zi/America/Argentina/Jujuy
  281. 0  jdk/jre/lib/zi/America/Argentina/La_Rioja
  282. 0  jdk/jre/lib/zi/America/Argentina/Mendoza
  283. 0  jdk/jre/lib/zi/America/Argentina/Rio_Gallegos
  284. 0  jdk/jre/lib/zi/America/Argentina/Salta
  285. 0  jdk/jre/lib/zi/America/Argentina/San_Juan
  286. 0  jdk/jre/lib/zi/America/Argentina/San_Luis
  287. 0  jdk/jre/lib/zi/America/Argentina/Tucuman
  288. 0  jdk/jre/lib/zi/America/Argentina/Ushuaia
  289. 0  jdk/jre/lib/zi/America/Aruba
  290. 0  jdk/jre/lib/zi/America/Asuncion
  291. 0  jdk/jre/lib/zi/America/Atikokan
  292. 0  jdk/jre/lib/zi/America/Bahia
  293. 0  jdk/jre/lib/zi/America/Bahia_Banderas
  294. 0  jdk/jre/lib/zi/America/Barbados
  295. 0  jdk/jre/lib/zi/America/Belem
  296. 0  jdk/jre/lib/zi/America/Belize
  297. 0  jdk/jre/lib/zi/America/Blanc-Sablon
  298. 0  jdk/jre/lib/zi/America/Boa_Vista
  299. 0  jdk/jre/lib/zi/America/Bogota
  300. 0  jdk/jre/lib/zi/America/Boise
Sorry, we could not display the entire diff because too many files (1,161) changed.
View
2,098 LICENSE
1,049 additions, 1,049 deletions not shown
View
72 NOTICE
@@ -1,36 +1,36 @@
-Apache Tomcat
-Copyright 1999-2012 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install System (NSIS), which is
-open source software. The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by Eclipse,
-which is open source software. The original software and
-related information is available at
-http://www.eclipse.org.
-
-For the bayeux implementation
-The org.apache.cometd.bayeux API is derivative work originating at the Dojo Foundation
-* Copyright 2007-2008 Guy Molinari
-* Copyright 2007-2008 Filip Hanik
-* Copyright 2007 Dojo Foundation
-* Copyright 2007 Mort Bay Consulting Pty. Ltd.
-
-The original XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
- - javaee_6.xsd
- - javaee_web_services_1_3.xsd
- - javaee_web_services_client_1_3.xsd
- - web-app_3_0.xsd
- - web-common_3_0.xsd
- - web-fragment_3_0.xsd
- - jsp_2_2.xsd
-may be obtained from http://java.sun.com/xml/ns/javaee/
+Apache Tomcat
+Copyright 1999-2012 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+The Windows Installer is built with the Nullsoft
+Scriptable Install System (NSIS), which is
+open source software. The original software and
+related information is available at
+http://nsis.sourceforge.net.
+
+Java compilation software for JSP pages is provided by Eclipse,
+which is open source software. The original software and
+related information is available at
+http://www.eclipse.org.
+
+For the bayeux implementation
+The org.apache.cometd.bayeux API is derivative work originating at the Dojo Foundation
+* Copyright 2007-2008 Guy Molinari
+* Copyright 2007-2008 Filip Hanik
+* Copyright 2007 Dojo Foundation
+* Copyright 2007 Mort Bay Consulting Pty. Ltd.
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+ - javaee_6.xsd
+ - javaee_web_services_1_3.xsd
+ - javaee_web_services_client_1_3.xsd
+ - web-app_3_0.xsd
+ - web-common_3_0.xsd
+ - web-fragment_3_0.xsd
+ - jsp_2_2.xsd
+may be obtained from http://java.sun.com/xml/ns/javaee/
View
222 README
@@ -1,111 +1,111 @@
-Caimito is an open source (Apache Software License 2.0) WebDAV,caching, and content-delivery server frontend for cloud storage. Caimito supports Softlayer Object Storage, Open Stack Storage, and Amazon S3. Caimito also features a REST interface for configuring user access. Caimito is ideal for Hosting and Reseller environments.
-
-Requirements
-Requires any Linux distro.
-
-Download
-http://cloud-drive.ngasi.com/s1/f1/caimito/public/caimito.zip
-
-Install
-cd to /usr directory
-unzip caimito contents to directory then copy 2 configuration files.
-cd /usr unzip -q -o -a caimito.zip cp /usr/caimito/conf/Catalina/localhost/ROOT.xml.sample /usr/caimito/conf/Catalina/localhost/ROOT.xml cp /usr/caimito/webapps/WEB-INF/caimito/config.properties.sample /usr/caimito/webapps/WEB-INF/caimito/config.properties
-
-Configure
-Database
-Caimito is installed with a default Derby Database.
-To change the database, edit the following file:
-/usr/caimito/conf/Catalina/localhost/ROOT.xml
-Resource Storage
-The resource storage type and access info is set in the following file:
-/usr/caimito/webapps/WEB-INF/caimito/config.properties
-The default storage type is "file". To change to a Cloud storage, edit the value for "resource". The value for Open Stack and Softlayer Object Storage would be "openstack" (Amazon S3 support coming soon). The values for "cloud.username", "cloud.api.key_password", "cloud.url", and "cloud.store" should be populated with the appropriate information. "cloud.store" is populated with the name of an already created "container" or "bucket".
-
-Run
-cd /usr/caimito/bin
-./startup.sh
-
-To run as a Deamon:
-./demon.sh
-
-To Stop:
-./shutdown.sh
-
-Access:
-Point any HTTP enabled client to:
-http://hostname:8619/
-NOTE: Make sure access to port 8619 is enabled through any firewall.
-
-By default access is restricted so you would be prompted to login. Login with the following information:
-User: caimitoadmin Password: caimito
-The above is the default Super Admin user. Follow the instructions below to change the password.
-
-Configuring Users:
-There are 4 default levels of Users. They are listed below in hierarchical order:
-Super Admin
-is the single user that has overriding control over all other users. The Super Admin has the privilege to create one or more Directory Admin and assign access to the Directory Admin to a sub directory.
-Directory Admin
-A Directory Admin has the privilege to create one or more Client and assign access to the client to a directory owned by the Directory Admin.
-Client
-A Client has the privilege to create one or more End User and assign access to the End User to a directory owned by the Client.
-End User
-Although the End User may have directory access, the End User has no administrative privilege.
-Configuring User access is a 2 step process. First the User is created, then the specific directory access is granted.
-Below is the steps to do so with the REST API. (The REST API is based on Shaftwork framework.)
-Create User
-http://hostname:8619/ca/shaftrest/shaftusermgr/add?shaftuser.new=user1&shaftpassword.new=tiger&shaftuser=caimitoadmin&shaftpassword=caimito
-Here a Directory Admin, user1, was created with the password tiger.
-Set Directory Privilege
-http://hostname:8619/ca/shaftrest/pathprivileges/add?shaftuser=caimitoadmin&shaftpassword=caimito&resourceuser=user1&path=dirpath1&privilege=2&maxspace=20
-Here user1, was assigned access to dirpath1 with a max space of 20GB. The directory path is an absolute path relative to the root directory path of the User (the root path for the Super Admin is /). So the newly protected path would look like:
-http://hostname:8619/dirpath1
-In the above example, the privilege was set with a value of 2. A privilege of 2 signifies READ/WRITE access. A privilege of 1 signifies READ only access.
-Privileges:
-1
-READ only
-2
-READ/WRITE
-Public Paths
-Authentication may not be required for all directory paths. In these situations, you set public path access - which means world read access to the directory.
-http://hostname:8619/ca/shaftrest/publicpaths/add?shaftuser=user1&shaftpassword=tiger&path=dirpath1/public&listing=false
-In the above example, the path, dirpath1/public, was set to world readable access. So the public path would look like:
-http://hostname:8619/dirpath1/public
-Also in this example, the optional "listing" attribute was set to false. If "listing" is set the true, users would be able to see a list of the contents contained in the directory.
-Change Password
-http://hostname:8619/ca/shaftrest/shaftusermgr/update?shaftpassword.new=lion&shaftuser=user1&shaftpassword=tiger
-The above example changes the password for user1 to lion.
-Delete User
-http://hostname:8619/ca/shaftrest/shaftusermgr/delete?shaftuser.eq=user1&shaftuser=caimitoadmin&shaftpassword=caimito
-The above example removes user1.
-Delete Directory Privilege
-http://hostname:8619/ca/shaftrest/pathprivileges/delete?shaftuser=caimitoadmin&shaftpassword=caimito&resourceuser.eq=user1&path.eq=dirpath1
-Here user1's privilege to dirpath1 was removed.
-Delete Public Paths
-http://hostname:8619/ca/shaftrest/publicpaths/delete?shaftuser=user1&shaftpassword=tiger&path.eq=dirpath1/public
-In the above example, world readable access to dirpath1/public, was removed.
-
-Mounting Caimito as a File System
-Windows
-Right Click "Computer"
-Click "Add a network location"
-Enter the appropriate Caimito URL and login credentials.
-Linux
-Download and install one of the packages at the following link:
-http://pkgs.repoforge.org/davfs2/
-Add Caimito access info like so
-echo "http://hostname:8619 caimitoadmin caimito" >> /etc/davfs2/secrets
-Create a directory to map the mounted file system
-mkdir /clouddrive
-Mount Caimito like so:
-mount -t davfs http://hostname:8619 /clouddrive
-Virtuozzo and OpenVZ
-Install fuse on the Host system like so:
-yum -y install fuse
-Then set the following for the VPS like so:
-vzctl set 227 --devnodes fuse:rw --save
-
-Web Interface
-COMING SOON!
-
-Community
-Contact: support(AT)ngasi.com
+Caimito is an open source (Apache Software License 2.0) WebDAV,caching, and content-delivery server frontend for cloud storage. Caimito supports Softlayer Object Storage, Open Stack Storage, and Amazon S3. Caimito also features a REST interface for configuring user access. Caimito is ideal for Hosting and Reseller environments.
+
+Requirements
+Requires any Linux distro.
+
+Download
+http://cloud-drive.ngasi.com/s1/f1/caimito/public/caimito.zip
+
+Install
+cd to /usr directory
+unzip caimito contents to directory then copy 2 configuration files.
+cd /usr unzip -q -o -a caimito.zip cp /usr/caimito/conf/Catalina/localhost/ROOT.xml.sample /usr/caimito/conf/Catalina/localhost/ROOT.xml cp /usr/caimito/webapps/WEB-INF/caimito/config.properties.sample /usr/caimito/webapps/WEB-INF/caimito/config.properties
+
+Configure
+Database
+Caimito is installed with a default Derby Database.
+To change the database, edit the following file:
+/usr/caimito/conf/Catalina/localhost/ROOT.xml
+Resource Storage
+The resource storage type and access info is set in the following file:
+/usr/caimito/webapps/WEB-INF/caimito/config.properties
+The default storage type is "file". To change to a Cloud storage, edit the value for "resource". The value for Open Stack and Softlayer Object Storage would be "openstack" (Amazon S3 support coming soon). The values for "cloud.username", "cloud.api.key_password", "cloud.url", and "cloud.store" should be populated with the appropriate information. "cloud.store" is populated with the name of an already created "container" or "bucket".
+
+Run
+cd /usr/caimito/bin
+./startup.sh
+
+To run as a Deamon:
+./demon.sh
+
+To Stop:
+./shutdown.sh
+
+Access:
+Point any HTTP enabled client to:
+http://hostname:8619/
+NOTE: Make sure access to port 8619 is enabled through any firewall.
+
+By default access is restricted so you would be prompted to login. Login with the following information:
+User: caimitoadmin Password: caimito
+The above is the default Super Admin user. Follow the instructions below to change the password.
+
+Configuring Users:
+There are 4 default levels of Users. They are listed below in hierarchical order:
+Super Admin
+is the single user that has overriding control over all other users. The Super Admin has the privilege to create one or more Directory Admin and assign access to the Directory Admin to a sub directory.
+Directory Admin
+A Directory Admin has the privilege to create one or more Client and assign access to the client to a directory owned by the Directory Admin.
+Client
+A Client has the privilege to create one or more End User and assign access to the End User to a directory owned by the Client.
+End User
+Although the End User may have directory access, the End User has no administrative privilege.
+Configuring User access is a 2 step process. First the User is created, then the specific directory access is granted.
+Below is the steps to do so with the REST API. (The REST API is based on Shaftwork framework.)
+Create User
+http://hostname:8619/ca/shaftrest/shaftusermgr/add?shaftuser.new=user1&shaftpassword.new=tiger&shaftuser=caimitoadmin&shaftpassword=caimito
+Here a Directory Admin, user1, was created with the password tiger.
+Set Directory Privilege
+http://hostname:8619/ca/shaftrest/pathprivileges/add?shaftuser=caimitoadmin&shaftpassword=caimito&resourceuser=user1&path=dirpath1&privilege=2&maxspace=20
+Here user1, was assigned access to dirpath1 with a max space of 20GB. The directory path is an absolute path relative to the root directory path of the User (the root path for the Super Admin is /). So the newly protected path would look like:
+http://hostname:8619/dirpath1
+In the above example, the privilege was set with a value of 2. A privilege of 2 signifies READ/WRITE access. A privilege of 1 signifies READ only access.
+Privileges:
+1
+READ only
+2
+READ/WRITE
+Public Paths
+Authentication may not be required for all directory paths. In these situations, you set public path access - which means world read access to the directory.
+http://hostname:8619/ca/shaftrest/publicpaths/add?shaftuser=user1&shaftpassword=tiger&path=dirpath1/public&listing=false
+In the above example, the path, dirpath1/public, was set to world readable access. So the public path would look like:
+http://hostname:8619/dirpath1/public
+Also in this example, the optional "listing" attribute was set to false. If "listing" is set the true, users would be able to see a list of the contents contained in the directory.
+Change Password
+http://hostname:8619/ca/shaftrest/shaftusermgr/update?shaftpassword.new=lion&shaftuser=user1&shaftpassword=tiger
+The above example changes the password for user1 to lion.
+Delete User
+http://hostname:8619/ca/shaftrest/shaftusermgr/delete?shaftuser.eq=user1&shaftuser=caimitoadmin&shaftpassword=caimito
+The above example removes user1.
+Delete Directory Privilege
+http://hostname:8619/ca/shaftrest/pathprivileges/delete?shaftuser=caimitoadmin&shaftpassword=caimito&resourceuser.eq=user1&path.eq=dirpath1
+Here user1's privilege to dirpath1 was removed.
+Delete Public Paths
+http://hostname:8619/ca/shaftrest/publicpaths/delete?shaftuser=user1&shaftpassword=tiger&path.eq=dirpath1/public
+In the above example, world readable access to dirpath1/public, was removed.
+
+Mounting Caimito as a File System
+Windows
+Right Click "Computer"
+Click "Add a network location"
+Enter the appropriate Caimito URL and login credentials.
+Linux
+Download and install one of the packages at the following link:
+http://pkgs.repoforge.org/davfs2/
+Add Caimito access info like so
+echo "http://hostname:8619 caimitoadmin caimito" >> /etc/davfs2/secrets
+Create a directory to map the mounted file system
+mkdir /clouddrive
+Mount Caimito like so:
+mount -t davfs http://hostname:8619 /clouddrive
+Virtuozzo and OpenVZ
+Install fuse on the Host system like so:
+yum -y install fuse
+Then set the following for the VPS like so:
+vzctl set 227 --devnodes fuse:rw --save
+
+Web Interface
+COMING SOON!
+
+Community
+Contact: support(AT)ngasi.com
View
456 RELEASE-NOTES
@@ -1,228 +1,228 @@
-================================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-================================================================================
-
-$Id: RELEASE-NOTES 1189163 2011-10-26 12:19:26Z kkolinko $
-
-
- Apache Tomcat Version 7.0.27
- Release Notes
-
-
-=========
-CONTENTS:
-=========
-
-* Dependency Changes
-* API Stability
-* JNI Based Applications
-* Bundled APIs
-* Web application reloading and static fields in shared libraries
-* Tomcat on Linux
-* Enabling SSI and CGI Support
-* Security manager URLs
-* Symlinking static resources
-* Viewing the Tomcat Change Log
-* Cryptographic software notice
-* When all else fails
-
-
-===================
-Dependency Changes:
-===================
-Tomcat 7.0 is designed to run on Java SE 6 and later.
-
-In addition, Tomcat 7.0 uses the Eclipse JDT Java compiler for
-compiling JSP pages. This means you no longer need to have the complete
-Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
-(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the
-binary Tomcat distributions. Tomcat can also be configured to use the
-compiler from the JDK to compile JSPs, or any other Java compiler supported
-by Apache Ant.
-
-
-==============
-API Stability:
-==============
-The public interfaces for the following classes are fixed and will not be
-changed at all during the remaining lifetime of the 7.x series:
-- javax/**/*
-
-The public interfaces for the following classes may be added to in order to
-resolve bugs and/or add new features. No existing interface will be removed or
-changed although it may be deprecated.
-- org/apache/catalina/*
-- org/apache/catalina/comet/*
-
-Note: As Tomcat 7 matures, the above list will be added to. The list is not
- considered complete at this time.
-
-The remaining classes are considered part of the Tomcat internals and may change
-without notice between point releases.
-
-
-=======================
-JNI Based Applications:
-=======================
-Applications that require native libraries must ensure that the libraries have
-been loaded prior to use. Typically, this is done with a call like:
-
- static {
- System.loadLibrary("path-to-library-file");
- }
-
-in some class. However, the application must also ensure that the library is
-not loaded more than once. If the above code were placed in a class inside
-the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the
-application were reloaded, the loadLibrary() call would be attempted a second
-time.
-
-To avoid this problem, place classes that load native libraries outside of the
-web application, and ensure that the loadLibrary() call is executed only once
-during the lifetime of a particular JVM.
-
-
-=============
-Bundled APIs:
-=============
-A standard installation of Tomcat 7.0 makes all of the following APIs available
-for use by web applications (by placing them in "lib"):
-* annotations-api.jar (Annotations package)
-* catalina.jar (Tomcat Catalina implementation)
-* catalina-ant.jar (Tomcat Catalina Ant tasks)
-* catalina-ha.jar (High availability package)
-* catalina-tribes.jar (Group communication)
-* ecj-3.7.2.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 2.2 API)
-* jasper.jar (Jasper 2 Compiler and Runtime)
-* jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 2.2 API)
-* servlet-api.jar (Servlet 3.0 API)
-* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
-* tomcat-coyote.jar (Tomcat connectors and utility classes)
-* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP)
-
-You can make additional APIs available to all of your web applications by
-putting unpacked classes into a "classes" directory (not created by default),
-or by placing them in JAR files in the "lib" directory.
-
-To override the XML parser implementation or interfaces, use the endorsed
-mechanism of the JVM. The default configuration defines JARs located in
-"endorsed" as endorsed.
-
-
-================================================================
-Web application reloading and static fields in shared libraries:
-================================================================
-Some shared libraries (many are part of the JDK) keep references to objects
-instantiated by the web application. To avoid class loading related problems
-(ClassCastExceptions, messages indicating that the classloader
-is stopped, etc.), the shared libraries state should be reinitialized.
-
-Something which might help is to avoid putting classes which would be
-referenced by a shared static field in the web application classloader,
-and putting them in the shared classloader instead (JARs should be put in the
-"lib" folder, and classes should be put in the "classes" folder).
-
-
-================
-Tomcat on Linux:
-================
-GLIBC 2.2 / Linux 2.4 users should define an environment variable:
-export LD_ASSUME_KERNEL=2.2.5
-
-Redhat Linux 9.0 users should use the following setting to avoid
-stability problems:
-export LD_ASSUME_KERNEL=2.4.1
-
-There are some Linux bugs reported against the NIO sendfile behavior, make sure you
-have a JDK that is up to date, or disable sendfile behavior in the Connector.<br/>
-6427312: (fc) FileChannel.transferTo() throws IOException "system call interrupted"<br/>
-5103988: (fc) FileChannel.transferTo should return -1 for EAGAIN instead throws IOException<br/>
-6253145: (fc) FileChannel.transferTo on Linux fails when going beyond 2GB boundary<br/>
-6470086: (fc) FileChannel.transferTo(2147483647, 1, channel) cause "Value too large" exception<br/>
-
-
-=============================
-Enabling SSI and CGI Support:
-=============================
-Because of the security risks associated with CGI and SSI available
-to web applications, these features are disabled by default.
-
-To enable and configure CGI support, please see the cgi-howto.html page.
-
-To enable and configue SSI support, please see the ssi-howto.html page.
-
-
-======================
-Security manager URLs:
-======================
-In order to grant security permissions to JARs located inside the
-web application repository, use URLs of of the following format
-in your policy file:
-
-file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
-
-
-============================
-Symlinking static resources:
-============================
-By default, Unix symlinks will not work when used in a web application to link
-resources located outside the web application root directory.
-
-This behavior is optional, and the "allowLinking" flag may be used to disable
-the check.
-
-
-==============================
-Viewing the Tomcat Change Log:
-==============================
-See changelog.html in this directory.
-
-
-=============================
-Cryptographic software notice
-=============================
-This distribution includes cryptographic software. The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software. BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted. See <http://www.wassenaar.org/> for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms. The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
-
-The following provides more details on the included cryptographic
-software:
- - Tomcat includes code designed to work with JSSE
- - Tomcat includes code designed to work with OpenSSL
-
-
-====================
-When all else fails:
-====================
-See the FAQ
-http://tomcat.apache.org/faq/
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
+$Id: RELEASE-NOTES 1189163 2011-10-26 12:19:26Z kkolinko $
+
+
+ Apache Tomcat Version 7.0.27
+ Release Notes
+
+
+=========
+CONTENTS:
+=========
+
+* Dependency Changes
+* API Stability
+* JNI Based Applications
+* Bundled APIs
+* Web application reloading and static fields in shared libraries
+* Tomcat on Linux
+* Enabling SSI and CGI Support
+* Security manager URLs
+* Symlinking static resources
+* Viewing the Tomcat Change Log
+* Cryptographic software notice
+* When all else fails
+
+
+===================
+Dependency Changes:
+===================
+Tomcat 7.0 is designed to run on Java SE 6 and later.
+
+In addition, Tomcat 7.0 uses the Eclipse JDT Java compiler for
+compiling JSP pages. This means you no longer need to have the complete
+Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
+(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the
+binary Tomcat distributions. Tomcat can also be configured to use the
+compiler from the JDK to compile JSPs, or any other Java compiler supported
+by Apache Ant.
+
+
+==============
+API Stability:
+==============
+The public interfaces for the following classes are fixed and will not be
+changed at all during the remaining lifetime of the 7.x series:
+- javax/**/*
+
+The public interfaces for the following classes may be added to in order to
+resolve bugs and/or add new features. No existing interface will be removed or
+changed although it may be deprecated.
+- org/apache/catalina/*
+- org/apache/catalina/comet/*
+
+Note: As Tomcat 7 matures, the above list will be added to. The list is not
+ considered complete at this time.
+
+The remaining classes are considered part of the Tomcat internals and may change
+without notice between point releases.
+
+
+=======================
+JNI Based Applications:
+=======================
+Applications that require native libraries must ensure that the libraries have
+been loaded prior to use. Typically, this is done with a call like:
+
+ static {
+ System.loadLibrary("path-to-library-file");
+ }
+
+in some class. However, the application must also ensure that the library is
+not loaded more than once. If the above code were placed in a class inside
+the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the
+application were reloaded, the loadLibrary() call would be attempted a second
+time.
+
+To avoid this problem, place classes that load native libraries outside of the
+web application, and ensure that the loadLibrary() call is executed only once
+during the lifetime of a particular JVM.
+
+
+=============
+Bundled APIs:
+=============
+A standard installation of Tomcat 7.0 makes all of the following APIs available
+for use by web applications (by placing them in "lib"):
+* annotations-api.jar (Annotations package)
+* catalina.jar (Tomcat Catalina implementation)
+* catalina-ant.jar (Tomcat Catalina Ant tasks)
+* catalina-ha.jar (High availability package)
+* catalina-tribes.jar (Group communication)
+* ecj-3.7.2.jar (Eclipse JDT Java compiler)
+* el-api.jar (EL 2.2 API)
+* jasper.jar (Jasper 2 Compiler and Runtime)
+* jasper-el.jar (Jasper 2 EL implementation)
+* jsp-api.jar (JSP 2.2 API)
+* servlet-api.jar (Servlet 3.0 API)
+* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
+* tomcat-coyote.jar (Tomcat connectors and utility classes)
+* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP)
+
+You can make additional APIs available to all of your web applications by
+putting unpacked classes into a "classes" directory (not created by default),
+or by placing them in JAR files in the "lib" directory.
+
+To override the XML parser implementation or interfaces, use the endorsed
+mechanism of the JVM. The default configuration defines JARs located in
+"endorsed" as endorsed.
+
+
+================================================================
+Web application reloading and static fields in shared libraries:
+================================================================
+Some shared libraries (many are part of the JDK) keep references to objects
+instantiated by the web application. To avoid class loading related problems
+(ClassCastExceptions, messages indicating that the classloader
+is stopped, etc.), the shared libraries state should be reinitialized.
+
+Something which might help is to avoid putting classes which would be
+referenced by a shared static field in the web application classloader,
+and putting them in the shared classloader instead (JARs should be put in the
+"lib" folder, and classes should be put in the "classes" folder).
+
+
+================
+Tomcat on Linux:
+================
+GLIBC 2.2 / Linux 2.4 users should define an environment variable:
+export LD_ASSUME_KERNEL=2.2.5
+
+Redhat Linux 9.0 users should use the following setting to avoid
+stability problems:
+export LD_ASSUME_KERNEL=2.4.1
+
+There are some Linux bugs reported against the NIO sendfile behavior, make sure you
+have a JDK that is up to date, or disable sendfile behavior in the Connector.<br/>
+6427312: (fc) FileChannel.transferTo() throws IOException "system call interrupted"<br/>
+5103988: (fc) FileChannel.transferTo should return -1 for EAGAIN instead throws IOException<br/>
+6253145: (fc) FileChannel.transferTo on Linux fails when going beyond 2GB boundary<br/>
+6470086: (fc) FileChannel.transferTo(2147483647, 1, channel) cause "Value too large" exception<br/>
+
+
+=============================
+Enabling SSI and CGI Support:
+=============================
+Because of the security risks associated with CGI and SSI available
+to web applications, these features are disabled by default.
+
+To enable and configure CGI support, please see the cgi-howto.html page.
+
+To enable and configue SSI support, please see the ssi-howto.html page.
+
+
+======================
+Security manager URLs:
+======================
+In order to grant security permissions to JARs located inside the
+web application repository, use URLs of of the following format
+in your policy file:
+
+file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
+
+
+============================
+Symlinking static resources:
+============================
+By default, Unix symlinks will not work when used in a web application to link
+resources located outside the web application root directory.
+
+This behavior is optional, and the "allowLinking" flag may be used to disable
+the check.
+
+
+==============================
+Viewing the Tomcat Change Log:
+==============================
+See changelog.html in this directory.
+
+
+=============================
+Cryptographic software notice
+=============================
+This distribution includes cryptographic software. The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of
+encryption software. BEFORE using any encryption software, please
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to
+see if this is permitted. See <http://www.wassenaar.org/> for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included cryptographic
+software:
+ - Tomcat includes code designed to work with JSSE
+ - Tomcat includes code designed to work with OpenSSL
+
+
+====================
+When all else fails:
+====================
+See the FAQ
+http://tomcat.apache.org/faq/
View
578 RUNNING.txt
@@ -1,289 +1,289 @@
-================================================================================
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-================================================================================
-
-$Id: RUNNING.txt 1196746 2011-11-02 18:31:50Z kkolinko $
-
- ===================================================
- Running The Apache Tomcat 7.0 Servlet/JSP Container
- ===================================================
-
-Apache Tomcat 7.0 requires the Java Standard Edition Runtime
-Environment (JRE) version 6.0 or later.
-
-=============================
-Running With JRE 6.0 Or Later
-=============================
-
-(1) Download and Install the Java SE Runtime Environment (JRE)
-
-(1.1) Download the Java SE Runtime Environment (JRE),
- release version 6.0 or later, from
- http://www.oracle.com/technetwork/java/javase/downloads/index.html
-
-(1.2) Install the JRE according to the instructions included with the
- release.
-
- You may also use the full JDK rather than just the JRE. In this
- case set you have to configure your environment variables
- differently - see below.
-
-
-(2) Download and Install the Tomcat Binary Distribution
-
-(2.1) Download a binary distribution of Tomcat from:
-
- http://tomcat.apache.org/
-
-(2.2) Unpack the binary distribution into a convenient location so that the
- distribution resides in its own directory (conventionally named
- "apache-tomcat-[version]").
-
- For the purposes of the remainder of this document, the name
- "CATALINA_HOME" is used to refer to the full pathname of the release
- directory.
-
-NOTE: As an alternative to downloading a binary distribution, you can
-create your own from the Tomcat source code, as described in
-"BUILDING.txt". You can either
-
- a) Do the full "release" build and find the created distributive in the
- "output/release" directory and then proceed with unpacking as above, or
-
- b) Do a simple build and use the "output/build" directory as
- "CATALINA_HOME". Be warned that there are some differences between
- contents of "output/build" and the official "release" distributive.
-
-
-(3) Configure Environment Variables
-
-Tomcat itself is a Java application and does not use environment variables,
-but the startup scripts use them to prepare the command that starts Tomcat.
-The full list of supported environment variables is provided as a comment
-at the top of catalina.bat (Windows) and catalina.sh (Unix) files.
-
-(3.1) CATALINA_HOME and CATALINA_BASE
-
-The CATALINA_HOME and CATALINA_BASE environment variables are used to
-specify location of Tomcat itself and of its active configuration
-respectively.
-
-The CATALINA_HOME environment variable should be set as defined in (2.2)
-above. The startup scripts have some logic to set this variable
-automatically if it is absent (based on the location of the script in
-Unixes and on the current directory in Windows), but it might be not
-perfect.
-
-The CATALINA_BASE environment variable is optional and is further described
-in "Multiple Tomcat Instances" section below. If it is not set it defaults
-to be equal to CATALINA_HOME.
-
-(3.2) JRE_HOME and other variables
-
-The third and the last environment variable that is needed to start Tomcat
-specifies location of JRE or JDK that should be used to start Tomcat.
-
-There are two different names of this variable, depending on whether JRE or
-JDK is used. Use the JRE_HOME variable to specify location of a JRE and
-JAVA_HOME variable to specify location of a JDK.
-
-All variables except CATALINA_HOME and CATALINA_BASE can be configured in a
-setenv.bat (Windows) or setenv.sh (Unix) file. The setenv file can be either
-in CATALINA_BASE/bin or in CATALINA_HOME/bin. If both are present, only the
-one in CATALINA_BASE is used.
-
-So, either set JRE_HOME variable by yourselves or create the file. For
-example,
-
-On Windows, %CATALINA_BASE%\bin\setenv.bat:
-
- set "JRE_HOME=%ProgramFiles%\Java\jre6"
- exit /b 0
-
-On Unix, $CATALINA_BASE/bin/setenv.sh:
-
- JRE_HOME=/usr/java/latest
-
-
-(4) Start Up Tomcat
-
-(4.1) Tomcat can be started by executing one of the following commands:
-
- %CATALINA_HOME%\bin\startup.bat (Windows)
-
- $CATALINA_HOME/bin/startup.sh (Unix)
-
- or
-
- %CATALINA_HOME%\bin\catalina.bat start (Windows)
-
- $CATALINA_HOME/bin/catalina.sh start (Unix)
-
-(4.2) After startup, the default web applications included with Tomcat will be
- available by visiting:
-
- http://localhost:8080/
-
-(4.3) Further information about configuring and running Tomcat can be found in
- the documentation included here, as well as on the Tomcat web site:
-
- http://tomcat.apache.org/
-
-
-(5) Shut Down Tomcat
-
-(5.1) Tomcat can be shut down by executing one of the following commands:
-
- %CATALINA_HOME%\bin\shutdown.bat (Windows)
-
- $CATALINA_HOME/bin/shutdown.sh (Unix)
-
- or
-
- %CATALINA_HOME%\bin\catalina.bat stop (Windows)
-
- $CATALINA_HOME/bin/catalina.sh stop (Unix)
-
-==================================================
-Advanced Configuration - Multiple Tomcat Instances
-==================================================
-
-In many circumstances, it is desirable to have a single copy of a Tomcat
-binary distribution shared among multiple users on the same server. To make
-this possible, you can set the CATALINA_BASE environment variable to the
-directory that contains the files for your 'personal' Tomcat instance.
-
-When running with separate CATALINA_HOME and CATALINA_BASE, the files
-and directories are split as following:
-
-In CATALINA_BASE:
-
- * bin - Only the following files:
-
- * setenv.sh (*nix) or setenv.bat (Windows),
- * tomcat-juli.jar
-
- The setenv scripts were described above. The tomcat-juli library
- is documented in the Logging chapter in the User Guide.
-
- * conf - Server configuration files (including server.xml)
-
- * lib - Libraries and classes
-
- * logs - Log and output files
-
- * webapps - Automatically loaded web applications
-
- * work - Temporary working directories for web applications
-
- * temp - Directory used by the JVM for temporary files (java.io.tmpdir)
-
-
-In CATALINA_HOME:
-
- * bin - Startup and shutdown scripts
-
- The following files will be used only if they are absent in
- CATALINA_BASE/bin:
-
- setenv.sh (*nix), setenv.bat (Windows), tomcat-juli.jar
-
- * lib - Libraries and classes, as explained below
-
- * endorsed - Libraries that override standard "Endorsed Standards"
- libraries provided by JRE. See Classloading documentation
- in the User Guide for details.
-
- By default this "endorsed" directory is absent.
-
-In the default configuration the JAR libraries and classes both in
-CATALINA_BASE/lib and in CATALINA_HOME/lib will be added to the common
-classpath, but the ones in CATALINA_BASE will be added first and thus will
-be searched first.
-
-The idea is that you may leave the standard Tomcat libraries in
-CATALINA_HOME/lib and add other ones such as database drivers into
-CATALINA_BASE/lib.
-
-In general it is advised to never share libraries between web applications,
-but put them into WEB-INF/lib directories inside the applications. See
-Classloading documentation in the User Guide for details.
-
-
-It might be useful to note that the values of CATALINA_HOME and
-CATALINA_BASE can be referenced in the XML configuration files processed
-by Tomcat as ${catalina.home} and ${catalina.base} respectively.
-
-For example, the standard manager web application can be kept in
-CATALINA_HOME/webapps/manager and loaded into CATALINA_BASE by using
-the following trick:
-
- * Copy the CATALINA_HOME/webapps/manager/META-INF/context.xml
- file as CATALINA_BASE/conf/Catalina/localhost/manager.xml
-
- * Add docBase attribute as shown below.
-
-The file will look like the following:
-
- <?xml version="1.0" encoding="UTF-8"?>
- <Context docBase="${catalina.home}/webapps/manager"
- antiResourceLocking="false" privileged="true" >
- </Context>
-
-See Deployer chapter in User Guide and Context and Host chapters in the
-Configuration Reference for more information on contexts and web
-application deployment.
-
-
-================
-Troubleshooting
-================
-
-There are only really 3 things likely to go wrong during the stand-alone
-Tomcat install:
-
-(1) The most common hiccup is when another web server (or any process for that
- matter) has laid claim to port 8080. This is the default HTTP port that
- Tomcat attempts to bind to at startup. To change this, open the file:
-
- $CATALINA_HOME/conf/server.xml
-
- and search for '8080'. Change it to a port that isn't in use, and is
- greater than 1024, as ports less than or equal to 1024 require superuser
- access to bind under UNIX.
-
- Restart Tomcat and you're in business. Be sure that you replace the "8080"
- in the URL you're using to access Tomcat. For example, if you change the
- port to 1977, you would request the URL http://localhost:1977/ in your browser.
-
-(2) An "out of environment space" error when running the batch files in
- Windows 95, 98, or ME operating systems.
-
- Right-click on the STARTUP.BAT and SHUTDOWN.BAT files. Click on
- "Properties", then on the "Memory" tab. For the "Initial environment" field,
- enter in something like 4096.
-
- After you click apply, Windows will create shortcuts which you can use
- to start and stop the container.
-
-(3) The 'localhost' machine isn't found. This could happen if you're behind a
- proxy. If that's the case, make sure the proxy configuration for your
- browser knows that you shouldn't be going through the proxy to access the
- "localhost".
-
- In Firefox, this is under Tools/Preferences -> Advanced/Network ->
- Connection -> Settings..., and in Internet Explorer it is Tools ->
- Internet Options -> Connections -> LAN Settings.
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
+$Id: RUNNING.txt 1196746 2011-11-02 18:31:50Z kkolinko $
+
+ ===================================================
+ Running The Apache Tomcat 7.0 Servlet/JSP Container
+ ===================================================
+
+Apache Tomcat 7.0 requires the Java Standard Edition Runtime
+Environment (JRE) version 6.0 or later.
+
+=============================
+Running With JRE 6.0 Or Later
+=============================
+
+(1) Download and Install the Java SE Runtime Environment (JRE)
+
+(1.1) Download the Java SE Runtime Environment (JRE),
+ release version 6.0 or later, from
+ http://www.oracle.com/technetwork/java/javase/downloads/index.html
+
+(1.2) Install the JRE according to the instructions included with the
+ release.
+
+ You may also use the full JDK rather than just the JRE. In this
+ case set you have to configure your environment variables
+ differently - see below.
+
+
+(2) Download and Install the Tomcat Binary Distribution
+
+(2.1) Download a binary distribution of Tomcat from:
+
+ http://tomcat.apache.org/
+
+(2.2) Unpack the binary distribution into a convenient location so that the
+ distribution resides in its own directory (conventionally named
+ "apache-tomcat-[version]").
+
+ For the purposes of the remainder of this document, the name
+ "CATALINA_HOME" is used to refer to the full pathname of the release
+ directory.
+
+NOTE: As an alternative to downloading a binary distribution, you can
+create your own from the Tomcat source code, as described in
+"BUILDING.txt". You can either
+
+ a) Do the full "release" build and find the created distributive in the
+ "output/release" directory and then proceed with unpacking as above, or
+
+ b) Do a simple build and use the "output/build" directory as
+ "CATALINA_HOME". Be warned that there are some differences between
+ contents of "output/build" and the official "release" distributive.
+
+
+(3) Configure Environment Variables
+
+Tomcat itself is a Java application and does not use environment variables,
+but the startup scripts use them to prepare the command that starts Tomcat.
+The full list of supported environment variables is provided as a comment
+at the top of catalina.bat (Windows) and catalina.sh (Unix) files.
+
+(3.1) CATALINA_HOME and CATALINA_BASE
+
+The CATALINA_HOME and CATALINA_BASE environment variables are used to
+specify location of Tomcat itself and of its active configuration
+respectively.
+
+The CATALINA_HOME environment variable should be set as defined in (2.2)
+above. The startup scripts have some logic to set this variable
+automatically if it is absent (based on the location of the script in
+Unixes and on the current directory in Windows), but it might be not
+perfect.
+
+The CATALINA_BASE environment variable is optional and is further described
+in "Multiple Tomcat Instances" section below. If it is not set it defaults
+to be equal to CATALINA_HOME.
+
+(3.2) JRE_HOME and other variables
+
+The third and the last environment variable that is needed to start Tomcat
+specifies location of JRE or JDK that should be used to start Tomcat.
+
+There are two different names of this variable, depending on whether JRE or
+JDK is used. Use the JRE_HOME variable to specify location of a JRE and
+JAVA_HOME variable to specify location of a JDK.
+
+All variables except CATALINA_HOME and CATALINA_BASE can be configured in a
+setenv.bat (Windows) or setenv.sh (Unix) file. The setenv file can be either
+in CATALINA_BASE/bin or in CATALINA_HOME/bin. If both are present, only the
+one in CATALINA_BASE is used.
+
+So, either set JRE_HOME variable by yourselves or create the file. For
+example,
+
+On Windows, %CATALINA_BASE%\bin\setenv.bat:
+
+ set "JRE_HOME=%ProgramFiles%\Java\jre6"
+ exit /b 0
+
+On Unix, $CATALINA_BASE/bin/setenv.sh:
+
+ JRE_HOME=/usr/java/latest
+
+
+(4) Start Up Tomcat
+
+(4.1) Tomcat can be started by executing one of the following commands:
+
+ %CATALINA_HOME%\bin\startup.bat (Windows)
+
+ $CATALINA_HOME/bin/startup.sh (Unix)
+
+ or
+
+ %CATALINA_HOME%\bin\catalina.bat start (Windows)
+
+ $CATALINA_HOME/bin/catalina.sh start (Unix)
+
+(4.2) After startup, the default web applications included with Tomcat will be
+ available by visiting:
+
+ http://localhost:8080/
+
+(4.3) Further information about configuring and running Tomcat can be found in
+ the documentation included here, as well as on the Tomcat web site:
+
+ http://tomcat.apache.org/
+
+
+(5) Shut Down Tomcat
+
+(5.1) Tomcat can be shut down by executing one of the following commands:
+
+ %CATALINA_HOME%\bin\shutdown.bat (Windows)
+
+ $CATALINA_HOME/bin/shutdown.sh (Unix)
+
+ or
+
+ %CATALINA_HOME%\bin\catalina.bat stop (Windows)
+
+ $CATALINA_HOME/bin/catalina.sh stop (Unix)
+
+==================================================
+Advanced Configuration - Multiple Tomcat Instances
+==================================================
+
+In many circumstances, it is desirable to have a single copy of a Tomcat
+binary distribution shared among multiple users on the same server. To make
+this possible, you can set the CATALINA_BASE environment variable to the
+directory that contains the files for your 'personal' Tomcat instance.
+
+When running with separate CATALINA_HOME and CATALINA_BASE, the files
+and directories are split as following:
+
+In CATALINA_BASE:
+
+ * bin - Only the following files:
+
+ * setenv.sh (*nix) or setenv.bat (Windows),
+ * tomcat-juli.jar
+
+ The setenv scripts were described above. The tomcat-juli library
+ is documented in the Logging chapter in the User Guide.
+
+ * conf - Server configuration files (including server.xml)
+
+ * lib - Libraries and classes
+
+ * logs - Log and output files
+
+ * webapps - Automatically loaded web applications
+
+ * work - Temporary working directories for web applications
+
+ * temp - Directory used by the JVM for temporary files (java.io.tmpdir)
+
+
+In CATALINA_HOME:
+
+ * bin - Startup and shutdown scripts
+
+ The following files will be used only if they are absent in
+ CATALINA_BASE/bin:
+
+ setenv.sh (*nix), setenv.bat (Windows), tomcat-juli.jar
+
+ * lib - Libraries and classes, as explained below
+
+ * endorsed - Libraries that override standard "Endorsed Standards"
+ libraries provided by JRE. See Classloading documentation
+ in the User Guide for details.
+
+ By default this "endorsed" directory is absent.
+
+In the default configuration the JAR libraries and classes both in
+CATALINA_BASE/lib and in CATALINA_HOME/lib will be added to the common
+classpath, but the ones in CATALINA_BASE will be added first and thus will
+be searched first.
+
+The idea is that you may leave the standard Tomcat libraries in
+CATALINA_HOME/lib and add other ones such as database drivers into
+CATALINA_BASE/lib.
+
+In general it is advised to never share libraries between web applications,
+but put them into WEB-INF/lib directories inside the applications. See
+Classloading documentation in the User Guide for details.
+
+
+It might be useful to note that the values of CATALINA_HOME and
+CATALINA_BASE can be referenced in the XML configuration files processed
+by Tomcat as ${catalina.home} and ${catalina.base} respectively.
+
+For example, the standard manager web application can be kept in
+CATALINA_HOME/webapps/manager and loaded into CATALINA_BASE by using
+the following trick:
+
+ * Copy the CATALINA_HOME/webapps/manager/META-INF/context.xml
+ file as CATALINA_BASE/conf/Catalina/localhost/manager.xml
+
+ * Add docBase attribute as shown below.
+
+The file will look like the following:
+
+ <?xml version="1.0" encoding="UTF-8"?>
+ <Context docBase="${catalina.home}/webapps/manager"
+ antiResourceLocking="false" privileged="true" >
+ </Context>
+
+See Deployer chapter in User Guide and Context and Host chapters in the
+Configuration Reference for more information on contexts and web
+application deployment.
+
+
+================
+Troubleshooting
+================
+
+There are only really 3 things likely to go wrong during the stand-alone
+Tomcat install:
+
+(1) The most common hiccup is when another web server (or any process for that
+ matter) has laid claim to port 8080. This is the default HTTP port that
+ Tomcat attempts to bind to at startup. To change this, open the file:
+
+ $CATALINA_HOME/conf/server.xml
+
+ and search for '8080'. Change it to a port that isn't in use, and is
+ greater than 1024, as ports less than or equal to 1024 require superuser
+ access to bind under UNIX.
+
+ Restart Tomcat and you're in business. Be sure that you replace the "8080"
+ in the URL you're using to access Tomcat. For example, if you change the
+ port to 1977, you would request the URL http://localhost:1977/ in your browser.
+
+(2) An "out of environment space" error when running the batch files in
+ Windows 95, 98, or ME operating systems.
+
+ Right-click on the STARTUP.BAT and SHUTDOWN.BAT files. Click on
+ "Properties", then on the "Memory" tab. For the "Initial environment" field,
+ enter in something like 4096.
+
+ After you click apply, Windows will create shortcuts which you can use
+ to start and stop the container.
+
+(3) The 'localhost' machine isn't found. This could happen if you're behind a
+ proxy. If that's the case, make sure the proxy configuration for your
+ browser knows that you shouldn't be going through the proxy to access the
+ "localhost".
+
+ In Firefox, this is under Tools/Preferences -> Advanced/Network ->
+ Connection -> Settings..., and in Internet Explorer it is Tools ->
+ Internet Options -> Connections -> LAN Settings.
View
122 bin/catalina-tasks.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--
- XML file for importing Catalina ant tasks.
- <import file="${catalina.home}/bin/catalina-tasks.xml"/>
--->
-
-<project name="catalina-tasks">
- <description>Catalina Ant Manager, JMX and JSPC Tasks</description>
- <!-- set catalina.home if it's not already set -->
- <dirname property="catalina.home.bin.dir" file="${ant.file.catalina-tasks}"/>
- <property name="catalina.home" value="${catalina.home.bin.dir}/.."/>
- <taskdef resource="org/apache/catalina/ant/catalina.tasks">
- <classpath>
- <fileset file="${catalina.home}/bin/tomcat-juli.jar"/>
- <fileset file="${catalina.home}/lib/tomcat-api.jar"/>
- <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
- <fileset file="${catalina.home}/lib/jasper.jar"/>
- <fileset file="${catalina.home}/lib/jasper-el.jar"/>
- <fileset file="${catalina.home}/lib/el-api.jar"/>
- <fileset file="${catalina.home}/lib/jsp-api.jar"/>
- <fileset file="${catalina.home}/lib/servlet-api.jar"/>
- <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
- <fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
- </classpath>
- </taskdef>
- <taskdef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
- <classpath>
- <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
- </classpath>
- </taskdef>
- <typedef
- name="jmxEquals"
- classname="org.apache.catalina.ant.jmx.JMXAccessorEqualsCondition">
- <classpath>
- <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
- </classpath>
- </typedef>
- <typedef
- name="jmxCondition"
- classname="org.apache.catalina.ant.jmx.JMXAccessorCondition">
- <classpath>
- <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
- </classpath>
- </typedef>
-</project>
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ XML file for importing Catalina ant tasks.
+ <import file="${catalina.home}/bin/catalina-tasks.xml"/>
+-->
+
+<project name="catalina-tasks">
+ <description>Catalina Ant Manager, JMX and JSPC Tasks</description>
+ <!-- set catalina.home if it's not already set -->
+ <dirname property="catalina.home.bin.dir" file="${ant.file.catalina-tasks}"/>
+ <property name="catalina.home" value="${catalina.home.bin.dir}/.."/>
+ <taskdef resource="org/apache/catalina/ant/catalina.tasks">
+ <classpath>
+ <fileset file="${catalina.home}/bin/tomcat-juli.jar"/>
+ <fileset file="${catalina.home}/lib/tomcat-api.jar"/>
+ <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
+ <fileset file="${catalina.home}/lib/jasper.jar"/>
+ <fileset file="${catalina.home}/lib/jasper-el.jar"/>
+ <fileset file="${catalina.home}/lib/el-api.jar"/>
+ <fileset file="${catalina.home}/lib/jsp-api.jar"/>
+ <fileset file="${catalina.home}/lib/servlet-api.jar"/>
+ <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+ <fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
+ </classpath>
+ </taskdef>
+ <taskdef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
+ <classpath>
+ <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+ </classpath>
+ </taskdef>
+ <typedef
+ name="jmxEquals"
+ classname="org.apache.catalina.ant.jmx.JMXAccessorEqualsCondition">
+ <classpath>
+ <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+ </classpath>
+ </typedef>
+ <typedef
+ name="jmxCondition"
+ classname="org.apache.catalina.ant.jmx.JMXAccessorCondition">
+ <classpath>
+ <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+ </classpath>
+ </typedef>
+</project>
View
646 bin/catalina.bat
@@ -1,323 +1,323 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-if "%OS%" == "Windows_NT" setlocal
-rem ---------------------------------------------------------------------------
-rem Start/Stop Script for the CATALINA Server
-rem
-rem Environment Variable Prerequisites
-rem
-rem Do not set the variables in this script. Instead put them into a script
-rem setenv.bat in CATALINA_BASE/bin to keep your customizations separate.
-rem
-rem CATALINA_HOME May point at your Catalina "build" directory.
-rem
-rem CATALINA_BASE (Optional) Base directory for resolving dynamic portions
-rem of a Catalina installation. If not present, resolves to
-rem the same directory that CATALINA_HOME points to.
-rem
-rem CATALINA_OPTS (Optional) Java runtime options used when the "start",
-rem "run" or "debug" command is executed.
-rem Include here and not in JAVA_OPTS all options, that should
-rem only be used by Tomcat itself, not by the stop process,
-rem the version command etc.
-rem Examples are heap size, GC logging, JMX ports etc.
-rem
-rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory
-rem the JVM should use (java.io.tmpdir). Defaults to
-rem %CATALINA_BASE%\temp.
-rem
-rem JAVA_HOME Must point at your Java Development Kit installation.
-rem Required to run the with the "debug" argument.
-rem
-rem JRE_HOME Must point at your Java Runtime installation.
-rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
-rem are both set, JRE_HOME is used.
-rem
-rem JAVA_OPTS (Optional) Java runtime options used when any command
-rem is executed.
-rem Include here and not in CATALINA_OPTS all options, that
-rem should be used by Tomcat and also by the stop process,
-rem the version command etc.
-rem Most options should go into CATALINA_OPTS.
-rem
-rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories
-rem containing some jars in order to allow replacement of APIs
-rem created outside of the JCP (i.e. DOM and SAX from W3C).
-rem It can also be used to update the XML parser implementation.
-rem Defaults to $CATALINA_HOME/endorsed.
-rem
-rem JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start"
-rem command is executed. The default is "dt_socket".
-rem
-rem JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start"
-rem command is executed. The default is 8000.
-rem
-rem JPDA_SUSPEND (Optional) Java runtime options used when the "jpda start"
-rem command is executed. Specifies whether JVM should suspend
-rem execution immediately after startup. Default is "n".
-rem
-rem JPDA_OPTS (Optional) Java runtime options used when the "jpda start"
-rem command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS,
-rem and JPDA_SUSPEND are ignored. Thus, all required jpda
-rem options MUST be specified. The default is:
-rem
-rem -agentlib:jdwp=transport=%JPDA_TRANSPORT%,
-rem address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
-rem
-rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file
-rem Example (all one line)
-rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
-rem
-rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
-rem Example (all one line)
-rem set LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-rem
-rem TITLE (Optional) Specify the title of Tomcat window. The default
-rem TITLE is Tomcat if it's not specified.
-rem Example (all one line)
-rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%]
-rem
-rem
-rem
-rem $Id: catalina.bat 1202062 2011-11-15 06:50:02Z mturk $
-rem ---------------------------------------------------------------------------
-
-rem Suppress Terminate batch job on CTRL+C
-if not ""%1"" == ""run"" goto mainEntry
-if ""%TEMP%"" == """" goto mainEntry
-if exist "%TEMP%\%~nx0.run" goto mainEntry
-echo Y>"%TEMP%\%~nx0.run"
-if not exist "%TEMP%\%~nx0.run" goto mainEntry
-echo Y>"%TEMP%\%~nx0.Y"
-call "%~f0" %* <"%TEMP%\%~nx0.Y"
-rem Use provided errorlevel
-set RETVAL=%ERRORLEVEL%
-del /Q "%TEMP%\%~nx0.Y" >NUL 2>&1
-exit /B %RETVAL%
-:mainEntry
-del /Q "%TEMP%\%~nx0.run" >NUL 2>&1
-
-rem Guess CATALINA_HOME if not defined
-set "CURRENT_DIR=%cd%"
-if not "%CATALINA_HOME%" == "" goto gotHome
-set "CATALINA_HOME=%CURRENT_DIR%"
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-cd ..
-set "CATALINA_HOME=%cd%"
-cd "%CURRENT_DIR%"
-:gotHome
-
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-echo The CATALINA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-:okHome
-
-rem Copy CATALINA_BASE from CATALINA_HOME if not defined
-if not "%CATALINA_BASE%" == "" goto gotBase
-set "CATALINA_BASE=%CATALINA_HOME%"
-:gotBase
-
-rem Ensure that any user defined CLASSPATH variables are not used on startup,
-rem but allow them to be specified in setenv.bat, in rare case when it is needed.
-set CLASSPATH=
-
-rem Get standard environment variables
-if not exist "%CATALINA_BASE%\bin\setenv.bat" goto checkSetenvHome
-call "%CATALINA_BASE%\bin\setenv.bat"
-goto setenvDone
-:checkSetenvHome
-if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
-:setenvDone
-
-rem Get standard Java environment variables
-if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
-echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat"
-echo This file is needed to run this program
-goto end
-:okSetclasspath
-call "%CATALINA_HOME%\bin\setclasspath.bat" %1
-if errorlevel 1 goto end
-
-rem Add on extra jar file to CLASSPATH
-rem Note that there are no quotes as we do not want to introduce random
-rem quotes into the CLASSPATH
-if "%CLASSPATH%" == "" goto emptyClasspath
-set "CLASSPATH=%CLASSPATH%;"
-:emptyClasspath
-set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar"
-
-if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
-set "CATALINA_TMPDIR=%CATALINA_BASE%\temp"
-:gotTmpdir
-
-rem Add tomcat-juli.jar to classpath
-rem tomcat-juli.jar can be over-ridden per instance
-if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome
-set "CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\bin\tomcat-juli.jar"
-goto juliClasspathDone
-:juliClasspathHome
-set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"
-:juliClasspathDone
-
-if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
-set LOGGING_CONFIG=-Dnop
-if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
-set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
-:noJuliConfig
-set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%
-
-if not "%LOGGING_MANAGER%" == "" goto noJuliManager
-set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-:noJuliManager
-set JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%
-
-rem ----- Execute The Requested Command ---------------------------------------
-
-echo Using CATALINA_BASE: "%CATALINA_BASE%"
-echo Using CATALINA_HOME: "%CATALINA_HOME%"
-echo Using CATALINA_TMPDIR: "%CATALINA_TMPDIR%"
-if ""%1"" == ""debug"" goto use_jdk
-echo Using JRE_HOME: "%JRE_HOME%"
-goto java_dir_displayed
-:use_jdk
-echo Using JAVA_HOME: "%JAVA_HOME%"
-:java_dir_displayed
-echo Using CLASSPATH: "%CLASSPATH%"
-
-set _EXECJAVA=%_RUNJAVA%
-set MAINCLASS=org.apache.catalina.startup.Bootstrap
-set ACTION=start
-set SECURITY_POLICY_FILE=
-set DEBUG_OPTS=
-set JPDA=
-
-if not ""%1"" == ""jpda"" goto noJpda
-set JPDA=jpda
-if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
-set JPDA_TRANSPORT=dt_socket
-:gotJpdaTransport
-if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
-set JPDA_ADDRESS=8000
-:gotJpdaAddress
-if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
-set JPDA_SUSPEND=n
-:gotJpdaSuspend
-if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
-set JPDA_OPTS=-agentlib:jdwp=transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
-:gotJpdaOpts
-shift
-:noJpda
-
-if ""%1"" == ""debug"" goto doDebug
-if ""%1"" == ""run"" goto doRun
-if ""%1"" == ""start"" goto doStart
-if ""%1"" == ""stop"" goto doStop
-if ""%1"" == ""configtest"" goto doConfigTest
-if ""%1"" == ""version"" goto doVersion
-
-echo Usage: catalina ( commands ... )
-echo commands:
-echo debug Start Catalina in a debugger
-echo debug -security Debug Catalina with a security manager
-echo jpda start Start Catalina under JPDA debugger
-echo run Start Catalina in the current window
-echo run -security Start in the current window with security manager
-echo start Start Catalina in a separate window
-echo start -security Start in a separate window with security manager
-echo stop Stop Catalina
-echo configtest Run a basic syntax check on server.xml
-echo version What version of tomcat are you running?
-goto end
-
-:doDebug
-shift
-set _EXECJAVA=%_RUNJDB%
-set DEBUG_OPTS=-sourcepath "%CATALINA_HOME%\..\..\java"
-if not ""%1"" == ""-security"" goto execCmd
-shift
-echo Using Security Manager
-set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
-goto execCmd
-
-:doRun
-shift
-if not ""%1"" == ""-security"" goto execCmd
-shift
-echo Using Security Manager
-set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
-goto execCmd
-
-:doStart
-shift
-if not "%OS%" == "Windows_NT" goto noTitle
-if "%TITLE%" == "" set TITLE=Tomcat
-set _EXECJAVA=start "%TITLE%" %_RUNJAVA%
-goto gotTitle
-:noTitle
-set _EXECJAVA=start %_RUNJAVA%
-:gotTitle
-if not ""%1"" == ""-security"" goto execCmd
-shift
-echo Using Security Manager
-set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
-goto execCmd
-
-:doStop
-shift
-set ACTION=stop
-set CATALINA_OPTS=
-goto execCmd
-
-:doConfigTest
-shift
-set ACTION=configtest
-set CATALINA_OPTS=
-goto execCmd
-
-:doVersion
-%_EXECJAVA% -classpath "%CATALINA_HOME%\lib\catalina.jar" org.apache.catalina.util.ServerInfo
-goto end
-
-
-:execCmd
-rem Get remaining unshifted command line arguments and save them in the
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
-
-rem Execute Java with the applicable properties
-if not "%JPDA%" == "" goto doJpda
-if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
-goto end
-:doSecurity
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
-goto end
-:doJpda
-if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
-goto end
-:doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
-goto end
-
-:end
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+if "%OS%" == "Windows_NT" setlocal
+rem ---------------------------------------------------------------------------
+rem Start/Stop Script for the CATALINA Server
+rem
+rem Environment Variable Prerequisites
+rem
+rem Do not set the variables in this script. Instead put them into a script
+rem setenv.bat in CATALINA_BASE/bin to keep your customizations separate.
+rem
+rem CATALINA_HOME May point at your Catalina "build" directory.
+rem
+rem CATALINA_BASE (Optional) Base directory for resolving dynamic portions
+rem of a Catalina installation. If not present, resolves to
+rem the same directory that CATALINA_HOME points to.
+rem
+rem CATALINA_OPTS (Optional) Java runtime options used when the "start",
+rem "run" or "debug" command is executed.
+rem Include here and not in JAVA_OPTS all options, that should
+rem only be used by Tomcat itself, not by the stop process,
+rem the version command etc.
+rem Examples are heap size, GC logging, JMX ports etc.
+rem
+rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory
+rem the JVM should use (java.io.tmpdir). Defaults to
+rem %CATALINA_BASE%\temp.
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem Required to run the with the "debug" argument.
+rem
+rem JRE_HOME Must point at your Java Runtime installation.
+rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
+rem are both set, JRE_HOME is used.
+rem
+rem JAVA_OPTS (Optional) Java runtime options used when any command
+rem is executed.
+rem Include here and not in CATALINA_OPTS all options, that
+rem should be used by Tomcat and also by the stop process,
+rem the version command etc.
+rem Most options should go into CATALINA_OPTS.
+rem
+rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories
+rem containing some jars in order to allow replacement of APIs
+rem created outside of the JCP (i.e. DOM and SAX from W3C).
+rem It can also be used to update the XML parser implementation.
+rem Defaults to $CATALINA_HOME/endorsed.
+rem
+rem JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start"
+rem command is executed. The default is "dt_socket".
+rem
+rem JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start"
+rem command is executed. The default is 8000.
+rem
+rem JPDA_SUSPEND (Optional) Java runtime options used when the "jpda start"
+rem command is executed. Specifies whether JVM should suspend
+rem execution immediately after startup. Default is "n".
+rem
+rem JPDA_OPTS (Optional) Java runtime options used when the "jpda start"
+rem command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS,
+rem and JPDA_SUSPEND are ignored. Thus, all required jpda
+rem options MUST be specified. The default is:
+rem
+rem -agentlib:jdwp=transport=%JPDA_TRANSPORT%,
+rem address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+rem
+rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file
+rem Example (all one line)
+rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
+rem
+rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
+rem Example (all one line)
+rem set LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+rem
+rem TITLE (Optional) Specify the title of Tomcat window. The default
+rem TITLE is Tomcat if it's not specified.
+rem Example (all one line)
+rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%]
+rem
+rem
+rem
+rem $Id: catalina.bat 1202062 2011-11-15 06:50:02Z mturk $
+rem ---------------------------------------------------------------------------
+
+rem Suppress Terminate batch job on CTRL+C
+if not ""%1"" == ""run"" goto mainEntry
+if ""%TEMP%"" == """" goto mainEntry
+if exist "%TEMP%\%~nx0.run" goto mainEntry
+echo Y>"%TEMP%\%~nx0.run"
+if not exist "%TEMP%\%~nx0.run" goto mainEntry
+echo Y>"%TEMP%\%~nx0.Y"
+call "%~f0" %* <"%TEMP%\%~nx0.Y"
+rem Use provided errorlevel
+set RETVAL=%ERRORLEVEL%
+del /Q "%TEMP%\%~nx0.Y" >NUL 2>&1
+exit /B %RETVAL%
+:mainEntry
+del /Q "%TEMP%\%~nx0.run" >NUL 2>&1
+
+rem Guess CATALINA_HOME if not defined
+set "CURRENT_DIR=%cd%"
+if not "%CATALINA_HOME%" == "" goto gotHome
+set "CATALINA_HOME=%CURRENT_DIR%"
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
+cd ..
+set "CATALINA_HOME=%cd%"
+cd "%CURRENT_DIR%"
+:gotHome
+
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
+echo The CATALINA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+rem Copy CATALINA_BASE from CATALINA_HOME if not defined
+if not "%CATALINA_BASE%" == "" goto gotBase
+set "CATALINA_BASE=%CATALINA_HOME%"
+:gotBase
+
+rem Ensure that any user defined CLASSPATH variables are not used on startup,
+rem but allow them to be specified in setenv.bat, in rare case when it is needed.
+set CLASSPATH=
+
+rem Get standard environment variables
+if not exist "%CATALINA_BASE%\bin\setenv.bat" goto checkSetenvHome
+call "%CATALINA_BASE%\bin\setenv.bat"
+goto setenvDone
+:checkSetenvHome
+if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
+:setenvDone
+
+rem Get standard Java environment variables
+if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
+echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat"
+echo This file is needed to run this program
+goto end
+:okSetclasspath
+call "%CATALINA_HOME%\bin\setclasspath.bat" %1
+if errorlevel 1 goto end
+
+rem Add on extra jar file to CLASSPATH
+rem Note that there are no quotes as we do not want to introduce random
+rem quotes into the CLASSPATH
+if "%CLASSPATH%" == "" goto emptyClasspath
+set "CLASSPATH=%CLASSPATH%;"
+:emptyClasspath
+set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar"
+
+if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
+set "CATALINA_TMPDIR=%CATALINA_BASE%\temp"
+:gotTmpdir
+
+rem Add tomcat-juli.jar to classpath
+rem tomcat-juli.jar can be over-ridden per instance
+if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome
+set "CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\bin\tomcat-juli.jar"
+goto juliClasspathDone
+:juliClasspathHome
+set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"
+:juliClasspathDone
+
+if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
+set LOGGING_CONFIG=-Dnop
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
+set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
+:noJuliConfig
+set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%
+
+if not "%LOGGING_MANAGER%" == "" goto noJuliManager
+set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+:noJuliManager
+set JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%
+
+rem ----- Execute The Requested Command ---------------------------------------
+
+echo Using CATALINA_BASE: "%CATALINA_BASE%"
+echo Using CATALINA_HOME: "%CATALINA_HOME%"
+echo Using CATALINA_TMPDIR: "%CATALINA_TMPDIR%"
+if ""%1"" == ""debug"" goto use_jdk
+echo Using JRE_HOME: "%JRE_HOME%"
+goto java_dir_displayed
+:use_jdk
+echo Using JAVA_HOME: "%JAVA_HOME%"
+:java_dir_displayed
+echo Using CLASSPATH: "%CLASSPATH%"
+
+set _EXECJAVA=%_RUNJAVA%
+set MAINCLASS=org.apache.catalina.startup.Bootstrap
+set ACTION=start
+set SECURITY_POLICY_FILE=
+set DEBUG_OPTS=
+set JPDA=
+
+if not ""%1"" == ""jpda"" goto noJpda
+set JPDA=jpda
+if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
+set JPDA_TRANSPORT=dt_socket
+:gotJpdaTransport
+if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
+set JPDA_ADDRESS=8000
+:gotJpdaAddress
+if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
+set JPDA_SUSPEND=n
+:gotJpdaSuspend
+if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
+set JPDA_OPTS=-agentlib:jdwp=transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+:gotJpdaOpts
+shift
+:noJpda
+
+if ""%1"" == ""debug"" goto doDebug
+if ""%1"" == ""run"" goto doRun
+if ""%1"" == ""start"" goto doStart
+if ""%1"" == ""stop"" goto doStop
+if ""%1"" == ""configtest"" goto doConfigTest
+if ""%1"" == ""version"" goto doVersion
+
+echo Usage: catalina ( commands ... )
+echo commands:
+echo debug Start Catalina in a debugger
+echo debug -security Debug Catalina with a security manager
+echo jpda start Start Catalina under JPDA debugger
+echo run Start Catalina in the current window
+echo run -security Start in the current window with security manager
+echo start Start Catalina in a separate window
+echo start -security Start in a separate window with security manager
+echo stop Stop Catalina
+echo configtest Run a basic syntax check on server.xml
+echo version What version of tomcat are you running?
+goto end
+
+:doDebug
+shift
+set _EXECJAVA=%_RUNJDB%
+set DEBUG_OPTS=-sourcepath "%CATALINA_HOME%\..\..\java"
+if not ""%1"" == ""-security"" goto execCmd
+shift
+echo Using Security Manager
+set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
+goto execCmd
+
+:doRun
+shift
+if not ""%1"" == ""-security"" goto execCmd
+shift
+echo Using Security Manager
+set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
+goto execCmd
+
+:doStart
+shift
+if not "%OS%" == "Windows_NT" goto noTitle
+if "%TITLE%" == "" set TITLE=Tomcat
+set _EXECJAVA=start "%TITLE%" %_RUNJAVA%
+goto gotTitle
+:noTitle
+set _EXECJAVA=start %_RUNJAVA%
+:gotTitle
+if not ""%1"" == ""-security"" goto execCmd
+shift
+echo Using Security Manager
+set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
+goto execCmd
+
+:doStop
+shift
+set ACTION=stop
+set CATALINA_OPTS=
+goto execCmd
+
+:doConfigTest
+shift
+set ACTION=configtest
+set CATALINA_OPTS=
+goto execCmd
+
+:doVersion
+%_EXECJAVA% -classpath "%CATALINA_HOME%\lib\catalina.jar" org.apache.catalina.util.ServerInfo
+goto end
+
+
+:execCmd
+rem Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+rem Execute Java with the applicable properties
+if not "%JPDA%" == "" goto doJpda
+if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+:doSecurity
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+:doJpda
+if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+:doSecurityJpda
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+
+:end
View
9 bin/catalina.sh
@@ -129,6 +129,15 @@ PRGDIR=`dirname "$PRG"`
# Copy CATALINA_BASE from CATALINA_HOME if not already set
[ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME"
+
+rm -f -R $CATALINA_HOME/logs/*
+rm -f -R $CATALINA_HOME/work/Catalina/localhost
+rm -f -R $CATALINA_HOME/temp
+mkdir -p $CATALINA_HOME/work/Catalina/localhost
+mkdir -p $CATALINA_HOME/temp
+
+
+
# Ensure that any user defined CLASSPATH variables are not used on startup,
# but allow them to be specified in setenv.sh, in rare case when it is needed.
CLASSPATH=
View
118 bin/configtest.bat
@@ -1,59 +1,59 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-if "%OS%" == "Windows_NT" setlocal
-rem ---------------------------------------------------------------------------
-rem Configuration test script for the CATALINA Server
-rem
-rem $Id: configtest.bat 1137560 2011-06-20 09:27:44Z rjung $
-rem ---------------------------------------------------------------------------
-
-rem Guess CATALINA_HOME if not defined
-set "CURRENT_DIR=%cd%"
-if not "%CATALINA_HOME%" == "" goto gotHome
-set "CATALINA_HOME=%CURRENT_DIR%"
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-cd ..
-set "CATALINA_HOME=%cd%"
-cd "%CURRENT_DIR%"
-:gotHome
-if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
-echo The CATALINA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-:okHome
-
-set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat"
-
-rem Check that target executable exists
-if exist "%EXECUTABLE%" goto okExec
-echo Cannot find "%EXECUTABLE%"
-echo This file is needed to run this program
-goto end
-:okExec
-
-rem Get remaining unshifted command line arguments and save them in the
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
-
-call "%EXECUTABLE%" configtest %CMD_LINE_ARGS%
-
-:end
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+if "%OS%" == "Windows_NT" setlocal
+rem ---------------------------------------------------------------------------
+rem Configuration test script for the CATALINA Server
+rem
+rem $Id: configtest.bat 1137560 2011-06-20 09:27:44Z rjung $
+rem ---------------------------------------------------------------------------
+
+rem Guess CATALINA_HOME if not defined
+set "CURRENT_DIR=%cd%"
+if not "%CATALINA_HOME%" == "" goto gotHome
+set "CATALINA_HOME=%CURRENT_DIR%"
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
+cd ..
+set "CATALINA_HOME=%cd%"
+cd "%CURRENT_DIR%"
+:gotHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
+echo The CATALINA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat"
+
+rem Check that target executable exists
+if exist "%EXECUTABLE%" goto okExec
+echo Cannot find "%EXECUTABLE%"
+echo This file is needed to run this program
+goto end
+:okExec
+
+rem Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+call "%EXECUTABLE%" configtest %CMD_LINE_ARGS%
+
+:end
View
70 bin/cpappend.bat
@@ -1,35 +1,35 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.