--- doc/allclasses-frame.html (revision 0) +++ doc/allclasses-frame.html (working copy) @@ -0,0 +1,18 @@ + + + + + +All Classes + + + + +

All Classes

+
+ +
+ + --- doc/allclasses-noframe.html (revision 0) +++ doc/allclasses-noframe.html (working copy) @@ -0,0 +1,18 @@ + + + + + +All Classes + + + + +

All Classes

+
+ +
+ + --- doc/constant-values.html (revision 0) +++ doc/constant-values.html (working copy) @@ -0,0 +1,113 @@ + + + + + +Constant Field Values + + + + + + + +
+ + + + + +
+ + +
+

Constant Field Values

+

Contents

+
+ +
+ + + + + +
+ + + + --- doc/deprecated-list.html (revision 0) +++ doc/deprecated-list.html (working copy) @@ -0,0 +1,113 @@ + + + + + +Deprecated List + + + + + + + +
+ + + + + +
+ + +
+

Deprecated API

+

Contents

+
+ +
+ + + + + +
+ + + + --- doc/help-doc.html (revision 0) +++ doc/help-doc.html (working copy) @@ -0,0 +1,214 @@ + + + + + +API Help + + + + + + + +
+ + + + + +
+ + +
+

How This API Document Is Organized

+
This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
+
+
+ +This help file applies to API documentation generated using the standard doclet.
+ +
+ + + + + +
+ + + + --- doc/index-files/index-1.html (revision 0) +++ doc/index-files/index-1.html (working copy) @@ -0,0 +1,118 @@ + + + + + +G-Index + + + + + + + +
+ + + + + +
+ + +
G L O  + + +

G

+
+
getName() - Method in error org.apache.tomcat.jni.LibraryNotFoundError
+
 
+
+G L O 
+ +
+ + + + + +
+ + + + --- doc/index-files/index-2.html (revision 0) +++ doc/index-files/index-2.html (working copy) @@ -0,0 +1,122 @@ + + + + + +L-Index + + + + + + + +
+ + + + + +
+ + +
G L O  + + +

L

+
+
LibraryNotFoundError - Error in org.apache.tomcat.jni
+
+
LibraryNotFoundError
+
+
LibraryNotFoundError(String, String) - Constructor for error org.apache.tomcat.jni.LibraryNotFoundError
+
 
+
+G L O 
+ +
+ + + + + +
+ + + + --- doc/index-files/index-3.html (revision 0) +++ doc/index-files/index-3.html (working copy) @@ -0,0 +1,118 @@ + + + + + +O-Index + + + + + + + +
+ + + + + +
+ + +
G L O  + + +

O

+
+
org.apache.tomcat.jni - package org.apache.tomcat.jni
+
 
+
+G L O 
+ +
+ + + + + +
+ + + + --- doc/index.html (revision 0) +++ doc/index.html (working copy) @@ -0,0 +1,30 @@ + + + + + +Generated Documentation (Untitled) + + + + + + +<noscript> +<div>JavaScript is disabled on your browser.</div> +</noscript> +<h2>Frame Alert</h2> +<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="org/apache/tomcat/jni/package-summary.html">Non-frame version</a>.</p> + + + --- doc/org/apache/tomcat/jni/LibraryNotFoundError.html (revision 0) +++ doc/org/apache/tomcat/jni/LibraryNotFoundError.html (working copy) @@ -0,0 +1,291 @@ + + + + + +LibraryNotFoundError + + + + + + + +
+ + + + + +
+ + + +
+
org.apache.tomcat.jni
+

Class LibraryNotFoundError

+
+
+ +
+ +
+
+ +
+
+ +
+
+ + +
+ + + + + +
+ + + + --- doc/org/apache/tomcat/jni/class-use/LibraryNotFoundError.html (revision 0) +++ doc/org/apache/tomcat/jni/class-use/LibraryNotFoundError.html (working copy) @@ -0,0 +1,113 @@ + + + + + +Uses of Class org.apache.tomcat.jni.LibraryNotFoundError + + + + + + + +
+ + + + + +
+ + +
+

Uses of Class
org.apache.tomcat.jni.LibraryNotFoundError

+
+
No usage of org.apache.tomcat.jni.LibraryNotFoundError
+ +
+ + + + + +
+ + + + --- doc/org/apache/tomcat/jni/package-frame.html (revision 0) +++ doc/org/apache/tomcat/jni/package-frame.html (working copy) @@ -0,0 +1,19 @@ + + + + + +org.apache.tomcat.jni + + + + +

org.apache.tomcat.jni

+
+

Errors

+ +
+ + --- doc/org/apache/tomcat/jni/package-summary.html (revision 0) +++ doc/org/apache/tomcat/jni/package-summary.html (working copy) @@ -0,0 +1,133 @@ + + + + + +org.apache.tomcat.jni + + + + + + + +
+ + + + + +
+ + +
+

Package org.apache.tomcat.jni

+
+
+ +
+ +
+ + + + + +
+ + + + --- doc/org/apache/tomcat/jni/package-tree.html (revision 0) +++ doc/org/apache/tomcat/jni/package-tree.html (working copy) @@ -0,0 +1,138 @@ + + + + + +org.apache.tomcat.jni Class Hierarchy + + + + + + + +
+ + + + + +
+ + +
+

Hierarchy For Package org.apache.tomcat.jni

+
+
+

Class Hierarchy

+ +
+ +
+ + + + + +
+ + + + --- doc/org/apache/tomcat/jni/package-use.html (revision 0) +++ doc/org/apache/tomcat/jni/package-use.html (working copy) @@ -0,0 +1,113 @@ + + + + + +Uses of Package org.apache.tomcat.jni + + + + + + + +
+ + + + + +
+ + +
+

Uses of Package
org.apache.tomcat.jni

+
+
No usage of org.apache.tomcat.jni
+ +
+ + + + + +
+ + + + --- doc/overview-tree.html (revision 0) +++ doc/overview-tree.html (working copy) @@ -0,0 +1,142 @@ + + + + + +Class Hierarchy + + + + + + + +
+ + + + + +
+ + +
+

Hierarchy For All Packages

+Package Hierarchies: + +
+
+

Class Hierarchy

+ +
+ +
+ + + + + +
+ + + + --- doc/package-list (revision 0) +++ doc/package-list (working copy) @@ -0,0 +1, @@ +org.apache.tomcat.jni --- doc/serialized-form.html (revision 0) +++ doc/serialized-form.html (working copy) @@ -0,0 +1,167 @@ + + + + + +Serialized Form + + + + + + + +
+ + + + + +
+ + +
+

Serialized Form

+
+
+ +
+ +
+ + + + + +
+ + + + --- doc/stylesheet.css (revision 0) +++ doc/stylesheet.css (working copy) @@ -0,0 +1,474 @@ +/* Javadoc style sheet */ +/* +Overall document style +*/ +body { + background-color:#ffffff; + color:#353833; + font-family:Arial, Helvetica, sans-serif; + font-size:76%; + margin:0; +} +a:link, a:visited { + text-decoration:none; + color:#4c6b87; +} +a:hover, a:focus { + text-decoration:none; + color:#bb7a2a; +} +a:active { + text-decoration:none; + color:#4c6b87; +} +a[name] { + color:#353833; +} +a[name]:hover { + text-decoration:none; + color:#353833; +} +pre { + font-size:1.3em; +} +h1 { + font-size:1.8em; +} +h2 { + font-size:1.5em; +} +h3 { + font-size:1.4em; +} +h4 { + font-size:1.3em; +} +h5 { + font-size:1.2em; +} +h6 { + font-size:1.1em; +} +ul { + list-style-type:disc; +} +code, tt { + font-size:1.2em; +} +dt code { + font-size:1.2em; +} +table tr td dt code { + font-size:1.2em; + vertical-align:top; +} +sup { + font-size:.6em; +} +/* +Document title and Copyright styles +*/ +.clear { + clear:both; + height:0px; + overflow:hidden; +} +.aboutLanguage { + float:right; + padding:0px 21px; + font-size:.8em; + z-index:200; + margin-top:-7px; +} +.legalCopy { + margin-left:.5em; +} +.bar a, .bar a:link, .bar a:visited, .bar a:active { + color:#FFFFFF; + text-decoration:none; +} +.bar a:hover, .bar a:focus { + color:#bb7a2a; +} +.tab { + background-color:#0066FF; + background-image:url(resources/titlebar.gif); + background-position:left top; + background-repeat:no-repeat; + color:#ffffff; + padding:8px; + width:5em; + font-weight:bold; +} +/* +Navigation bar styles +*/ +.bar { + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + padding:.8em .5em .4em .8em; + height:auto;/*height:1.8em;*/ + font-size:1em; + margin:0; +} +.topNav { + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; +} +.bottomNav { + margin-top:10px; + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; +} +.subNav { + background-color:#dee3e9; + border-bottom:1px solid #9eadc0; + float:left; + width:100%; + overflow:hidden; +} +.subNav div { + clear:left; + float:left; + padding:0 0 5px 6px; +} +ul.navList, ul.subNavList { + float:left; + margin:0 25px 0 0; + padding:0; +} +ul.navList li{ + list-style:none; + float:left; + padding:3px 6px; +} +ul.subNavList li{ + list-style:none; + float:left; + font-size:90%; +} +.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { + color:#FFFFFF; + text-decoration:none; +} +.topNav a:hover, .bottomNav a:hover { + text-decoration:none; + color:#bb7a2a; +} +.navBarCell1Rev { + background-image:url(resources/tab.gif); + background-color:#a88834; + color:#FFFFFF; + margin: auto 5px; + border:1px solid #c9aa44; +} +/* +Page header and footer styles +*/ +.header, .footer { + clear:both; + margin:0 20px; + padding:5px 0 0 0; +} +.indexHeader { + margin:10px; + position:relative; +} +.indexHeader h1 { + font-size:1.3em; +} +.title { + color:#2c4557; + margin:10px 0; +} +.subTitle { + margin:5px 0 0 0; +} +.header ul { + margin:0 0 25px 0; + padding:0; +} +.footer ul { + margin:20px 0 5px 0; +} +.header ul li, .footer ul li { + list-style:none; + font-size:1.2em; +} +/* +Heading styles +*/ +div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { + background-color:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + margin:0 0 6px -8px; + padding:2px 5px; +} +ul.blockList ul.blockList ul.blockList li.blockList h3 { + background-color:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + margin:0 0 6px -8px; + padding:2px 5px; +} +ul.blockList ul.blockList li.blockList h3 { + padding:0; + margin:15px 0; +} +ul.blockList li.blockList h2 { + padding:0px 0 20px 0; +} +/* +Page layout container styles +*/ +.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { + clear:both; + padding:10px 20px; + position:relative; +} +.indexContainer { + margin:10px; + position:relative; + font-size:1.0em; +} +.indexContainer h2 { + font-size:1.1em; + padding:0 0 3px 0; +} +.indexContainer ul { + margin:0; + padding:0; +} +.indexContainer ul li { + list-style:none; +} +.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { + font-size:1.1em; + font-weight:bold; + margin:10px 0 0 0; + color:#4E4E4E; +} +.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { + margin:10px 0 10px 20px; +} +.serializedFormContainer dl.nameValue dt { + margin-left:1px; + font-size:1.1em; + display:inline; + font-weight:bold; +} +.serializedFormContainer dl.nameValue dd { + margin:0 0 0 1px; + font-size:1.1em; + display:inline; +} +/* +List styles +*/ +ul.horizontal li { + display:inline; + font-size:0.9em; +} +ul.inheritance { + margin:0; + padding:0; +} +ul.inheritance li { + display:inline; + list-style:none; +} +ul.inheritance li ul.inheritance { + margin-left:15px; + padding-left:15px; + padding-top:1px; +} +ul.blockList, ul.blockListLast { + margin:10px 0 10px 0; + padding:0; +} +ul.blockList li.blockList, ul.blockListLast li.blockList { + list-style:none; + margin-bottom:25px; +} +ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { + padding:0px 20px 5px 10px; + border:1px solid #9eadc0; + background-color:#f9f9f9; +} +ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { + padding:0 0 5px 8px; + background-color:#ffffff; + border:1px solid #9eadc0; + border-top:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { + margin-left:0; + padding-left:0; + padding-bottom:15px; + border:none; + border-bottom:1px solid #9eadc0; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { + list-style:none; + border-bottom:none; + padding-bottom:0; +} +table tr td dl, table tr td dl dt, table tr td dl dd { + margin-top:0; + margin-bottom:1px; +} +/* +Table styles +*/ +.contentContainer table, .classUseContainer table, .constantValuesContainer table { + border-bottom:1px solid #9eadc0; + width:100%; +} +.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { + width:100%; +} +.contentContainer .description table, .contentContainer .details table { + border-bottom:none; +} +.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ + vertical-align:top; + padding-right:20px; +} +.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, +.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, +.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, +.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { + padding-right:3px; +} +.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { + position:relative; + text-align:left; + background-repeat:no-repeat; + color:#FFFFFF; + font-weight:bold; + clear:none; + overflow:hidden; + padding:0px; + margin:0px; +} +caption a:link, caption a:hover, caption a:active, caption a:visited { + color:#FFFFFF; +} +.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { + white-space:nowrap; + padding-top:8px; + padding-left:8px; + display:block; + float:left; + background-image:url(resources/titlebar.gif); + height:18px; +} +.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { + width:10px; + background-image:url(resources/titlebar_end.gif); + background-repeat:no-repeat; + background-position:top right; + position:relative; + float:left; +} +ul.blockList ul.blockList li.blockList table { + margin:0 0 12px 0px; + width:100%; +} +.tableSubHeadingColor { + background-color: #EEEEFF; +} +.altColor { + background-color:#eeeeef; +} +.rowColor { + background-color:#ffffff; +} +.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { + text-align:left; + padding:3px 3px 3px 7px; +} +th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { + background:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + text-align:left; + padding:3px 3px 3px 7px; +} +td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + font-weight:bold; +} +td.colFirst, th.colFirst { + border-left:1px solid #9eadc0; + white-space:nowrap; +} +td.colLast, th.colLast { + border-right:1px solid #9eadc0; +} +td.colOne, th.colOne { + border-right:1px solid #9eadc0; + border-left:1px solid #9eadc0; +} +table.overviewSummary { + padding:0px; + margin-left:0px; +} +table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, +table.overviewSummary td.colOne, table.overviewSummary th.colOne { + width:25%; + vertical-align:middle; +} +table.packageSummary td.colFirst, table.overviewSummary th.colFirst { + width:25%; + vertical-align:middle; +} +/* +Content styles +*/ +.description pre { + margin-top:0; +} +.deprecatedContent { + margin:0; + padding:10px 0; +} +.docSummary { + padding:0; +} +/* +Formatting effect styles +*/ +.sourceLineNo { + color:green; + padding:0 30px 0 0; +} +h1.hidden { + visibility:hidden; + overflow:hidden; + font-size:.9em; +} +.block { + display:block; + margin:3px 0 0 0; +} +.strong { + font-weight:bold; +} --- java/org/apache/catalina/core/AprLifecycleListener.java (revision 1659151) +++ java/org/apache/catalina/core/AprLifecycleListener.java (working copy) @@ -29,6 +29,7 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.jni.Library; +import org.apache.tomcat.jni.LibraryNotFoundError; import org.apache.tomcat.jni.SSL; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.res.StringManager; @@ -208,8 +209,27 @@ } catch (Throwable t) { t = ExceptionUtils.unwrapInvocationTargetException(t); ExceptionUtils.handleThrowable(t); - initInfoLogMessages.add(sm.getString("aprListener.aprInit", - System.getProperty("java.library.path"))); + + if(t instanceof LibraryNotFoundError){ + log.warn(sm.getString("aprListener.aprNotFound", + ((LibraryNotFoundError) t).getName(), + System.getProperty("java.library.path"))); + if(log.isDebugEnabled()) { + log.error(sm.getString("aprListener.aprNotFound", + ((LibraryNotFoundError) t).getName(), + System.getProperty("java.library.path")), t); + } + }else if(t instanceof UnsatisfiedLinkError){ + log.warn(sm.getString("aprListener.aprFailedToLoad", + System.getProperty("java.library.path"))); + if(log.isDebugEnabled()) { + log.error(sm.getString("aprListener.aprFailedToLoad", + System.getProperty("java.library.path")), t); + } + }else{ + initInfoLogMessages.add(sm.getString("aprListener.aprInit", + System.getProperty("java.library.path"))); + } return; } if (apver < rqver) { --- java/org/apache/catalina/core/LocalStrings.properties (revision 1659151) +++ java/org/apache/catalina/core/LocalStrings.properties (working copy) @@ -51,6 +51,8 @@ applicationServletRegistration.setServletSecurity.ise=Security constraints can't be added to servlet [{0}] deployed to context with name [{1}] as the context has already been initialised applicationSessionCookieConfig.ise=Property {0} can not be added to SessionCookieConfig for context {1} as the context has been initialised aprListener.aprInit=The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: {0} +aprListener.aprNotFound=The APR based Apache Tomcat Native library {0} which allows optimal performance in production environments was not found on the java.library.path: {1} +aprListener.aprFailedToLoad=Failed to load The APR based Apache Tomcat Native library which allows optimal performance in production environments aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache Tomcat Native library is installed, while Tomcat requires version {1} aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat Native library is installed, while Tomcat recommends a minimum version of {1} aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native library --- java/org/apache/tomcat/jni/Library.java (revision 1659151) +++ java/org/apache/tomcat/jni/Library.java (working copy) @@ -18,6 +18,7 @@ package org.apache.tomcat.jni; import java.io.File; +import java.io.FileNotFoundException; /** Library * @@ -49,22 +50,26 @@ if (t instanceof VirtualMachineError) { throw (VirtualMachineError) t; } + String name = System.mapLibraryName(NAMES[i]); String path = System.getProperty("java.library.path"); String [] paths = path.split(File.pathSeparator); for (int j=0; j 0) - err.append(", "); + } err.append(t.getMessage()); + err.append('('); + err.append(System.getProperty("java.library.path")); + err.append(')'); + throw new LibraryNotFoundError(name, err.toString()); } if (loaded) break; - } + } + if (!loaded) { err.append('('); err.append(System.getProperty("java.library.path")); --- java/org/apache/tomcat/jni/LibraryNotFoundError.java (revision 0) +++ java/org/apache/tomcat/jni/LibraryNotFoundError.java (working copy) @@ -0,0 +1,35 @@ +/* + * 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. + */ + +package org.apache.tomcat.jni; + +/** + * LibraryNotFoundError + * @author VIN + */ +public class LibraryNotFoundError extends UnsatisfiedLinkError{ + + String nameOfTheLibrary = null; + public LibraryNotFoundError(String name, String errorMessage){ + super(errorMessage); + nameOfTheLibrary = name; + } + + public String getName(){ + return nameOfTheLibrary; + } +}