Author: remm
Date: Fri Jun 29 09:36:40 2018
New Revision: 1834660
URL: http://svn.apache.org/viewvc?rev=1834660&view=rev
Log:
61632: Change location from native/bin to just bin.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834660&r1=1834659&r2=1834660&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun 29 09:36:40 2018
@@ -79,7 +79,7 @@
<property name="test.temp" value="${tomcat.output}/test-tmp"/>
<property name="test.basedir" value="${tomcat.build}"/>
<property name="test.reports" value="${test.basedir}/logs"/>
- <property name="test.apr.loc" value="${test.basedir}/bin/native"/>
+ <property name="test.apr.loc" value="${test.basedir}/bin"/>
<!-- base directory for jdbc-pool -->
<property name="tomcat.jdbc.dir" value="${basedir}/modules/jdbc-pool"/>
<!-- build output directory for jdbc-pool -->
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1834660&r1=1834659&r2=1834660&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Fri Jun 29 09:36:40
2018
@@ -36,9 +36,8 @@ public final class Library {
boolean loaded = false;
StringBuilder err = new StringBuilder();
File binLib = new File(System.getProperty("catalina.home"), "bin");
- File nativeLib = new File(binLib, "native");
for (int i = 0; i < NAMES.length; i++) {
- File library = new File(nativeLib,
System.mapLibraryName(NAMES[i]));
+ File library = new File(binLib, System.mapLibraryName(NAMES[i]));
try {
System.load(library.getPath());
loaded = true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1834660&r1=1834659&r2=1834660&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 29 09:36:40 2018
@@ -72,7 +72,7 @@
</scode>
<fix>
<bug>56676</bug>: Add a default location for the native library, as
- bin/native, which the testsuite already uses. (remm)
+ ${catalina.home}/bin, which the testsuite already uses. (remm)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
