cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Library.java

2005-05-27 Thread remm 
remm2005/05/27 03:04:43

  Modified:catalina/src/share/org/apache/catalina/core
AprLifecycleListener.java
   jni/java/org/apache/tomcat/jni Library.java
  Log:
  - terminate(boolean) -> terminate().
  
  Revision  ChangesPath
  1.2   +3 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
  
  Index: AprLifecycleListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AprLifecycleListener.java 27 May 2005 09:41:38 -  1.1
  +++ AprLifecycleListener.java 27 May 2005 10:04:43 -  1.2
  @@ -78,13 +78,9 @@
   } else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) {
   try {
   String methodName = "terminate";
  -Class paramTypes[] = new Class[1];
  -paramTypes[0] = Boolean.TYPE;
  -Object paramValues[] = new Object[1];
  -paramValues[0] = Boolean.TRUE;
   Method method = 
Class.forName("org.apache.tomcat.jni.Library")
  -.getMethod(methodName, paramTypes);
  -method.invoke(null, paramValues);
  +.getMethod(methodName, null);
  +method.invoke(null, null);
   } catch (Throwable t) {
   if (!log.isDebugEnabled()) {
   log.info(sm.getString("aprListener.aprDestroy"));
  
  
  
  1.5   +2 -14 
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java
  
  Index: Library.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Library.java  16 Apr 2005 09:17:38 -  1.4
  +++ Library.java  27 May 2005 10:04:43 -  1.5
  @@ -68,7 +68,7 @@
   /* destroy global TCN's APR pool
* This has to be the last call to TCN library.
*/
  -private static native void terminate();
  +public static native void terminate();
   /* Internal function for loading APR Features */
   private static native boolean has(int what);
   /* Internal function for loading APR Features */
  @@ -196,16 +196,4 @@
   return initialize();
   }
   
  -/**
  - * Tear down any APR internal data structures which aren't torn down
  - * automatically.
  - * An APR program must call this function at termination once it
  - * has stopped using APR services.
  - */
  -static public void terminate(boolean doCleanup)
  -{
  -terminate();
  -/* TODO: doCleanup code */
  -}
  -
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Library.java

2005-04-16 Thread jfclere 
jfclere 2005/04/16 02:17:38

  Modified:jni/java/org/apache/tomcat/jni Library.java
  Log:
  print java.library.path when the library cannot be loaded.
  
  Revision  ChangesPath
  1.4   +4 -1  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java
  
  Index: Library.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Library.java  18 Jan 2005 10:22:32 -  1.3
  +++ Library.java  16 Apr 2005 09:17:38 -  1.4
  @@ -49,6 +49,9 @@
   break;
   }
   if (!loaded) {
  +err += "(";
  +err += System.getProperty("java.library.path");
  +err += ")";
   throw new UnsatisfiedLinkError(err);
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Library.java

2005-01-18 Thread mturk 
mturk   2005/01/18 02:22:32

  Modified:jni/java/org/apache/tomcat/jni Library.java
  Log:
  Change native library default names to tcnative.
  
  Revision  ChangesPath
  1.3   +2 -2  
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java
  
  Index: Library.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Library.java  14 Jan 2005 14:42:37 -  1.2
  +++ Library.java  18 Jan 2005 10:22:32 -  1.3
  @@ -25,7 +25,7 @@
   public final class Library {
   
   /* Default library names */
  -private static String [] NAMES = {"aprjava-1", "libaprjava-1"};
  +private static String [] NAMES = {"tcnative-1", "libtcnative-1"};
   /*
* A handle to the unique Library singleton instance.
*/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]