Added logging to pluglet module

a = laa@sparc.spb.su r = idk@eng.sun.com Added workaround for 24194 a = idk@eng.sun.com
2000-01-18 02:53:58 +00:00 · 2000-01-18 02:53:58 +00:00 · 7599ee2943
--- a/java/plugins/jni/PlugletLog.h
+++ b/java/plugins/jni/PlugletLog.h
@ -0,0 +1,8 @@
+#include "prlog.h"
+
+struct PRLodMoguleInfo;
+
+class PlugletLog {
+ public:
+    static PRLogModuleInfo* log;
+};
--- a/java/plugins/jni/PlugletOutputStream.cpp
+++ b/java/plugins/jni/PlugletOutputStream.cpp
@ -20,12 +20,14 @@
 */

 #include "PlugletOutputStream.h"
-
+#include "PlugletLog.h"

 jclass    PlugletOutputStream::clazz = NULL;
 jmethodID PlugletOutputStream::initMID = NULL;

 void PlugletOutputStream::Initialize(JNIEnv *env) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletOutputStream.Initialize\n"));
    clazz = env->FindClass("org/mozilla/pluglet/mozilla/PlugletOutputStream");
    if (!clazz) {
 	env->ExceptionDescribe();
@ -41,6 +43,8 @@ void PlugletOutputStream::Initialize(JNIEnv *env) {
 }

 void PlugletOutputStream::Destroy(JNIEnv *env) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletOutputStream.Destroy\n"));
    //nb  who gonna cal it?
    if(clazz) {
 	env->DeleteGlobalRef(clazz);
--- a/java/plugins/jni/PlugletTagInfo2.cpp
+++ b/java/plugins/jni/PlugletTagInfo2.cpp
@ -20,12 +20,14 @@
 */

 #include "PlugletTagInfo2.h"
-
+#include "PlugletLog.h"

 jclass    PlugletTagInfo2::clazz = NULL;
 jmethodID PlugletTagInfo2::initMID = NULL;

 void PlugletTagInfo2::Initialize(JNIEnv *env) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2.Initialize\n"));
    clazz = env->FindClass("org/mozilla/pluglet/mozilla/PlugletTagInfo2Impl");
    if (!clazz) {
 	env->ExceptionDescribe();
@ -41,6 +43,8 @@ void PlugletTagInfo2::Initialize(JNIEnv *env) {
 }

 void PlugletTagInfo2::Destroy(JNIEnv *env) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2.Destroy\n"));
    //nb  who gonna cal it?
    if(clazz) {
 	env->DeleteGlobalRef(clazz);
--- a/java/plugins/jni/makefile.win
+++ b/java/plugins/jni/makefile.win
@ -60,6 +60,7 @@ DLL = .\$(OBJDIR)\$(DLLNAME).dll
 #//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
 #//
 #//------------------------------------------------------------------------
+LLIBS=$(LLIBS)  $(LIBNSPR) $(DIST)\lib\xpcom.lib
 #//------------------------------------------------------------------------
 #//
 #// Include the common makefile rules
--- a/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletInputStream.cpp
+++ b/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletInputStream.cpp
@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include "nsIInputStream.h"
 #include "org_mozilla_pluglet_mozilla_PlugletInputStream.h"
+#include "PlugletLog.h"

 static jfieldID peerFID = NULL;
 /*
@ -31,9 +32,11 @@ static jfieldID peerFID = NULL;
 */
 JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletInputStream_available
    (JNIEnv *env, jobject jthis) {
-    nsIInputStream * input = (nsIInputStream*)env->GetLongField(jthis, peerFID);;
+    nsIInputStream * input = (nsIInputStream*)env->GetLongField(jthis, peerFID);
    PRUint32 res = 0;
    if(input) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletInputStream.available: stream = %p\n", input));
 	input->Available(&res);
    }
    return (jint)res;
@ -48,6 +51,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletInputStream_close
    (JNIEnv *env, jobject jthis) {
    nsIInputStream * input = (nsIInputStream*)env->GetLongField(jthis, peerFID);
    if (input) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletInputStream.close: stream = %p\n", input));
 	NS_RELEASE(input);
 	env->SetLongField(jthis, peerFID,0);
    }
@ -64,6 +69,11 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletInputStream_nativ
    (JNIEnv *env, jobject jthis, jbyteArray b, jint off, jint len) {
    PRUint32 retval = 0;
    nsIInputStream * input = (nsIInputStream*)env->GetLongField(jthis, peerFID);
+    if (input) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletInputStream.nativeRead: stream = %p, off = %i, len = %i\n", input, off, len));
+    }
+
    if (env->ExceptionOccurred()) {
 	return retval;
    }
@ -86,6 +96,9 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletInputStream_nativ
 	free(bufElems);
 	return retval;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletInputStream.nativeRead: %i bytes read\n", retval));
+
    env->SetByteArrayRegion(b,off,len,bufElems);
    free(bufElems);
    return retval;
@ -101,6 +114,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletInputStream_nativ
    /* nb do as in java-dom  stuff */
    nsIInputStream * input = (nsIInputStream*)env->GetLongField(jthis, peerFID);
    if(input) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletInputStream.nativeFinalize: stream = %p\n", input));
 	NS_RELEASE(input);    
    }
 }
@ -119,7 +134,10 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletInputStream_nativ
 	}
    }
    nsIInputStream * input = (nsIInputStream*)env->GetLongField(jthis, peerFID);
+
    if (input) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletInputStream.nativeInitialize: stream = %p\n", input));
 	input->AddRef();
    }
 }
--- a/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletManagerImpl.cpp
+++ b/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletManagerImpl.cpp
@ -20,8 +20,12 @@
 */
 #include "nsIPluginManager.h"
 #include "org_mozilla_pluglet_mozilla_PlugletManagerImpl.h"
-
+#include "PlugletLog.h"
+  
 static jfieldID peerFID = NULL;
+PRLogModuleInfo* PlugletLog::log = NULL;
+
+
 /*
 * Class:     org_mozilla_pluglet_mozilla_PlugletManagerImpl
 * Method:    reloadPluglets
@ -30,7 +34,13 @@ static jfieldID peerFID = NULL;
 JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_reloadPluglets
    (JNIEnv *env, jobject jthis, jboolean jparam) {
     nsIPluginManager * manager = (nsIPluginManager*)env->GetLongField(jthis, peerFID);
+     if (!manager) {
+ 	 PR_LOG(PlugletLog::log, PR_LOG_ERROR,
+		 ("PlugletManagerImpl.reloadPluglets: ERROR, manager = NULL"));
+     }
     PRBool param = (jparam == JNI_TRUE) ? PR_TRUE : PR_FALSE;
+     PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletManagerImpl.reloadPluglets: param = %i\n", param));
     manager->ReloadPlugins(param);
 }

@ -42,11 +52,17 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_reloa
 JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_userAgent
    (JNIEnv *env, jobject jthis) {
    nsIPluginManager * manager = (nsIPluginManager*)env->GetLongField(jthis, peerFID);
+    if (!manager) {
+	PR_LOG(PlugletLog::log, PR_LOG_ERROR,
+		("PlugletManagerImpl.userAgent: ERROR, manager = NULL"));
+    }
    const char * res = NULL;
    if (NS_FAILED(manager->UserAgent(&res)) 
 	|| !res) {
        return NULL;
    } else {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletManagerImpl.userAgent: result = %s\n", res));
        return  env->NewStringUTF(res);
    }
 }    
@ -59,6 +75,10 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_us
 JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_getURL
    (JNIEnv *env, jobject jthis, jobject, jobject, jstring, jobject, jstring, jobject, jboolean) {
    nsIPluginManager * manager = (nsIPluginManager*)env->GetLongField(jthis, peerFID);
+    if (manager) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletManagerImpl.getURL: manager = %s\n", manager));
+    }
    //nb
 }

@ -70,6 +90,10 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_getUR
 JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_postURL
    (JNIEnv *env, jobject jthis, jobject, jobject, jint, jbyteArray, jboolean, jstring, jobject, jstring, jobject, jboolean, jint, jbyteArray) {
    nsIPluginManager * manager = (nsIPluginManager*)env->GetLongField(jthis, peerFID);
+    if (manager) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletManagerImpl.postURL: manager = %s\n", manager));
+    }
    //nb
 }

@ -82,6 +106,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_nativ
    (JNIEnv *env, jobject jthis) {
    nsIPluginManager * manager = (nsIPluginManager*)env->GetLongField(jthis, peerFID);
    if(manager) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletManagerImpl.nativeFinalize: manager = %s\n", manager));
 	NS_RELEASE(manager);
    }
 }
@ -93,6 +119,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_nativ
 */
 JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_nativeInitialize
    (JNIEnv *env, jobject jthis) {
+    PlugletLog::log = PR_NewLogModule("pluglets");
    if(!peerFID) {
 	peerFID = env->GetFieldID(env->GetObjectClass(jthis),"peer","J");
 	if (!peerFID) {
@ -101,6 +128,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletManagerImpl_nativ
    }
    nsIPluginManager * manager = (nsIPluginManager*)env->GetLongField(jthis, peerFID);
    if (manager) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletManagerImpl.nativeInitialize: manager = %p\n", manager));
 	manager->AddRef();
    }
 }
--- a/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletOutputStream.cpp
+++ b/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletOutputStream.cpp
@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include "nsIOutputStream.h"
 #include "org_mozilla_pluglet_mozilla_PlugletOutputStream.h"
+#include "PlugletLog.h"

 static jfieldID peerFID = NULL;
 /*
@ -36,6 +37,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_flus
     if(!output) {
 	 return;
     }
+     PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletOutputStream.flush: stream = %p\n", output));
     output->Flush();
 }

@ -55,9 +58,13 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_nati
    if(!output) {
 	return;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletOutputStream.nativeWrite: stream = %p, off = %i, len = %i\n", output, off, len));
    env->GetByteArrayRegion(b,off,len,buf);
    PRUint32 tmp;
    output->Write(buf,len,&tmp);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletOutputStream.nativeWrite: %i bytes written\n", tmp));
    free(buf);
 }

@ -71,6 +78,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_nati
    /* nb do as in java-dom  stuff */
    nsIOutputStream * output = (nsIOutputStream*)env->GetLongField(jthis, peerFID);
    if(output) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletOutputStream.nativeFinalize: stream = %p\n", output));
 	NS_RELEASE(output);    
    }
 }
@ -90,6 +99,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_nati
    }
    nsIOutputStream * output = (nsIOutputStream*)env->GetLongField(jthis, peerFID);
    if (output) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletOutputStream.nativeInitialize: stream = %p\n", output));
 	output->AddRef();
    }
 }
@ -103,6 +114,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletOutputStream_clos
    (JNIEnv *env, jobject jthis) {
    nsIOutputStream * output = (nsIOutputStream*)env->GetLongField(jthis, peerFID);
    if (output) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletOutputStream.close: stream = %p\n", output));
 	NS_RELEASE(output);
 	env->SetLongField(jthis, peerFID,0);
    }
--- a/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp
+++ b/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletPeerImpl.cpp
@ -19,6 +19,7 @@
 #include "PlugletOutputStream.h"
 #include "PlugletTagInfo2.h"
 #include "org_mozilla_pluglet_mozilla_PlugletPeerImpl.h"
+#include "PlugletLog.h"

 static jfieldID peerFID = NULL;
 /*
@ -32,10 +33,14 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getMI
    if (!instancePeer) {
 	return NULL;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.getMIMEType: instancePeer = %p\n", instancePeer));
    nsMIMEType mime;
    if(NS_FAILED(instancePeer->GetMIMEType(&mime))) {
 	return NULL;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.getMIMEType: mime type is = %s\n", (char *)mime));
    return env->NewStringUTF((char *)mime);
 }

@ -46,6 +51,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getMI
 */
 JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getMode
    (JNIEnv *, jobject) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.getMode: always return 1\n"));
    return 1; //nb
 }

@ -56,6 +63,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getMode
 */
 JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getValue
    (JNIEnv *, jobject, jint) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.getValue: stub\n"));
    return NULL; //nb
 }

@ -66,6 +75,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getVa
 */
 JNIEXPORT jobject JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_newStream
    (JNIEnv *env, jobject jthis, jstring _type, jstring _target) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.newStream: mime type is %s, target is %s\n", _type, _target));
    nsMIMEType mimeType = NULL;
    if ( _type == NULL
         || _target == NULL) {
@ -102,12 +113,22 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_newSt
 * Signature: (Ljava/lang/String;)V
 */
 JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_showStatus
-    (JNIEnv *env, jobject jthis, jstring _msg) {
+(JNIEnv *env, jobject jthis, jstring _msg) {
+    if(1) { //work around for bug 24194
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	       ("PlugletPeerImpl.showStatus:  nsIPluginInstancePeer.ShowStatus crashes browser \n"
+		"So we skeep calling this method. See bug 24194.\n"
+		"msg=%s\n", _msg));
+	return;
+	
+    }
    nsIPluginInstancePeer * instancePeer = (nsIPluginInstancePeer*)env->GetLongField(jthis, peerFID);
    if (!instancePeer
        || !_msg) {
 	return;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.showStatus: massage is %s\n", _msg));
    const char *msg = NULL;
    if(!(msg = env->GetStringUTFChars(_msg,NULL))) {
 	return;
@ -123,6 +144,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_showStat
 */
 JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_setWindowSize
    (JNIEnv *env, jobject jthis, jint width, jint height) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.setWindowSize: width = %i, height = %i\n", width, height));
    nsIPluginInstancePeer * instancePeer = (nsIPluginInstancePeer*)env->GetLongField(jthis, peerFID);
    if (!instancePeer) {
 	return;
@ -142,6 +165,11 @@ static NS_DEFINE_IID(kIPluginTagInfo2,NS_IPLUGINTAGINFO2_IID);
 JNIEXPORT jobject JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_getTagInfo
    (JNIEnv *env, jobject jthis) {
     nsIPluginInstancePeer * instancePeer = (nsIPluginInstancePeer*)env->GetLongField(jthis, peerFID);
+     if (!instancePeer) {
+	 return NULL;
+     }
+     PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletPeerImpl.getTagInfo: instancePeer = %p\n", instancePeer));
     nsIPluginTagInfo2 * info = NULL;
     if(NS_FAILED(instancePeer->QueryInterface(kIPluginTagInfo2,(void**)&info))) {
 	 return NULL;
@ -158,6 +186,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_nativeFi
    (JNIEnv *env, jobject jthis) {
    nsIPluginInstancePeer * instancePeer = (nsIPluginInstancePeer*)env->GetLongField(jthis, peerFID);
    if (instancePeer) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletPeerImpl.nativeFinalize: instancePeer = %p\n", instancePeer));
 	/*nb do as in java-dom  stuff */
 	NS_RELEASE(instancePeer);
    }
@ -178,6 +208,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletPeerImpl_nativeIn
    }
    nsIPluginInstancePeer * instancePeer = (nsIPluginInstancePeer*)env->GetLongField(jthis, peerFID);
    if (instancePeer) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletPeerImpl.nativeInitialize: instancePeer = %p\n", instancePeer));
 	instancePeer->AddRef();
    }
 }
--- a/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl.cpp
+++ b/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl.cpp
@ -21,6 +21,7 @@
 #include "nsIPluginStreamInfo.h"
 #include "org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl.h"
 #include "ByteRanges.h"
+#include "PlugletLog.h"

 static jfieldID peerFID = NULL;
 /*
@ -39,6 +40,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl
 		 || !mimeType) {
 	return NULL;
    } else {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletStreamInfoImpl.getContentType: mime type is %s\n", (char *)mimeType));
 	return env->NewStringUTF((char *)mimeType);
    }
 }
@ -56,6 +59,8 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImp
    }
    PRBool res;
    streamInfo->IsSeekable(&res);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamInfoImpl.isSeakable: res = %i\n", res));
    if (res == PR_TRUE) {
        return JNI_TRUE;
    } else {
@ -77,6 +82,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl_ge
    }
    PRUint32 length;
    nsresult rv = streamInfo->GetLength(&length);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamInfoImpl.getLength: length = %i\n", length));
    if (NS_FAILED(rv)) {
        return -1;
    }
@ -96,6 +103,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl_ge
    }
    PRUint32 res = 0;
    streamInfo->GetLastModified(&res);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamInfoImpl.getLastModified: res = %i\n", res));
    return res;
    
 }
@ -113,6 +122,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl
    }
    const char *res = NULL;
    streamInfo->GetURL(&res); /* do we need to free this memory */
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamInfoImpl.getURL: url = %s\n", res));
    return (res)? env->NewStringUTF(res) : NULL;
 }

@ -128,6 +139,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl_re
 	return;
    }
    nsByteRange* range = ByteRanges::GetByteRanges(env,object);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamInfoImpl.requestRead\n"));
    streamInfo->RequestRead(range);
    ByteRanges::FreeByteRanges(range);
 }
@ -142,6 +155,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl_na
    /* nb do as in java-dom  stuff */
    nsIPluginStreamInfo * streamInfo = (nsIPluginStreamInfo*)env->GetLongField(jthis, peerFID);
    if (streamInfo) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletStreamInfoImpl.nativeFinalize: streamInfo = %p\n", streamInfo));
 	NS_RELEASE(streamInfo);
    }
 }
@ -161,6 +176,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletStreamInfoImpl_na
    }
    nsIPluginStreamInfo * streamInfo = (nsIPluginStreamInfo*)env->GetLongField(jthis, peerFID);;
    if (streamInfo) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletStreamInfoImpl.nativeInitialize: streamInfo = %p\n", streamInfo));
 	streamInfo->AddRef();
    }
 }
--- a/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl.cpp
+++ b/java/plugins/jni/org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl.cpp
@ -20,6 +20,7 @@
 */
 #include "nsIPluginTagInfo2.h"
 #include "org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl.h"
+#include "PlugletLog.h"

 static jfieldID peerFID = NULL;
 /*
@ -29,6 +30,8 @@ static jfieldID peerFID = NULL;
 */
 JNIEXPORT jobject JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getAttributes
    (JNIEnv *, jobject) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getAttributes: stub\n"));
    //nb Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getAttributes
    return NULL;
 }
@ -40,6 +43,8 @@ JNIEXPORT jobject JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
 */
 JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getAttribute
    (JNIEnv *env, jobject jthis, jstring _name) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getAttribute: name = %s\n", _name));
    if (!_name) {
 	return NULL;
    }
@ -54,6 +59,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
 	return NULL;
    }
    env->ReleaseStringUTFChars(_name,name);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getAttribute: value = %s\n", result));
    return env->NewStringUTF(result);
 }

@ -84,6 +91,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
 	 res = "UNKNOWN";
 	 break;
     }
+     PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getTagType: tag is %s\n", res));
     return env->NewStringUTF(res);
 }

@ -99,6 +108,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
    if(NS_FAILED(info->GetTagText(&text))) {
 	return NULL;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getTagText: text = %s\n", text));
    return env->NewStringUTF(text);
 }

@ -114,6 +125,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
    if(NS_FAILED(info->GetDocumentBase(&base))) {
 	return NULL;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getDocumentBase: base = %s\n", base));
    return env->NewStringUTF(base);
 }

@ -129,6 +142,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
    if(NS_FAILED(info->GetDocumentEncoding(&encoding))) {
 	return NULL;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getDocumentEncoding: encoding = %s\n", encoding));
    return env->NewStringUTF(encoding);
 }

@ -145,6 +160,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_g
    if(NS_FAILED(info->GetAlignment(&aligment))) {
 	return NULL;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getAlignment: align = %s\n", aligment));
    return env->NewStringUTF(aligment);
 }

@ -160,6 +177,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getW
    if(NS_FAILED(info->GetWidth(&res))) {
 	return 0;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getWidth: width = %i\n", res));
    return res;
 }

@ -175,6 +194,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getH
    if(NS_FAILED(info->GetHeight(&res))) {
 	return 0;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getHeight: width = %i\n", res));
    return res;
 }

@ -190,6 +211,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getB
    if(NS_FAILED(info->GetBorderVertSpace(&res))) {
 	return 0;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getBorderVertSpace: res = %i\n", res));
    return res;
 }

@ -205,6 +228,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getB
    if(NS_FAILED(info->GetBorderHorizSpace(&res))) {
 	return 0;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getBorderHorizSpace: res = %i\n", res));
    return res;
 }

@ -220,6 +245,8 @@ JNIEXPORT jint JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_getU
    if(NS_FAILED(info->GetUniqueID(&res))) {
 	return 0;
    }
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletTagInfo2Impl.getUniqueID: id = %i\n", res));
    return res;
 }

@ -233,6 +260,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_nati
    /* nb do as in java-dom  stuff */
    nsIPluginTagInfo2 * info = (nsIPluginTagInfo2*)env->GetLongField(jthis, peerFID);
    if(info) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletTagInfo2Impl.nativeFinalize: info = %p\n", info));
 	NS_RELEASE(info);    
    }
 }
@ -252,6 +281,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_pluglet_mozilla_PlugletTagInfo2Impl_nati
    }
    nsIPluginTagInfo2 * info = (nsIPluginTagInfo2*)env->GetLongField(jthis, peerFID);
    if (info) {
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+		("PlugletTagInfo2Impl.nativeInitialize: info = %p\n", info));
 	info->AddRef();
    }
 }
--- a/java/plugins/src/Pluglet.cpp
+++ b/java/plugins/src/Pluglet.cpp
@ -24,7 +24,7 @@
 #include "PlugletPeer.h"
 #include "Registry.h"
 #include "PlugletViewFactory.h"
-
+#include "PlugletLog.h"

 jmethodID Pluglet::initializeMID = NULL;
 jmethodID Pluglet::startMID = NULL;
@ -54,11 +54,15 @@ Pluglet::~Pluglet() {
 }

 NS_METHOD Pluglet::HandleEvent(nsPluginEvent* event, PRBool* handled) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::HandleEvent; stub\n"));
    //nb we do not need it under win32
    return NS_OK;
 }

 NS_METHOD Pluglet::Initialize(nsIPluginInstancePeer* _peer) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::Initialize\n"));
    JNIEnv *env = PlugletEngine::GetJNIEnv();
    if (!printMID) {
 	jclass clazz = env->FindClass("org/mozilla/pluglet/Pluglet");
@ -113,14 +117,16 @@ NS_METHOD Pluglet::Initialize(nsIPluginInstancePeer* _peer) {
 }

 NS_METHOD Pluglet::GetPeer(nsIPluginInstancePeer* *result) {
-    printf("--Pluglet::GetPeer\n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::GetPeer\n"));
    peer->AddRef();
    *result = peer;
    return NS_OK;
 }

 NS_METHOD Pluglet::Start(void) {
-    printf("--Pluglet::Start\n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::Start\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->CallVoidMethod(jthis,startMID);
    if (env->ExceptionOccurred()) {
@ -130,7 +136,8 @@ NS_METHOD Pluglet::Start(void) {
    return NS_OK;
 }
 NS_METHOD Pluglet::Stop(void) {
-    printf("--Pluglet::Stop\n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::Stop\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->CallVoidMethod(jthis,stopMID);
    if (env->ExceptionOccurred()) {
@ -140,6 +147,8 @@ NS_METHOD Pluglet::Stop(void) {
    return NS_OK;
 }
 NS_METHOD Pluglet::Destroy(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::Destroy\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->CallVoidMethod(jthis,destroyMID);
    if (env->ExceptionOccurred()) {
@ -150,7 +159,8 @@ NS_METHOD Pluglet::Destroy(void) {
 }

 NS_METHOD Pluglet::NewStream(nsIPluginStreamListener** listener) {
-    printf("--Pluglet::NewStream \n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::NewStream\n"));
    if(!listener) {
 	return NS_ERROR_FAILURE;
    }
@ -168,12 +178,14 @@ NS_METHOD Pluglet::NewStream(nsIPluginStreamListener** listener) {
 }

 NS_METHOD Pluglet::GetValue(nsPluginInstanceVariable variable, void *value) {
-    printf("--Pluglet::GetValue\n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::GetValue; stub\n"));
    return NS_ERROR_FAILURE;
 }

 NS_METHOD Pluglet::SetWindow(nsPluginWindow* window) {
-    printf("--Pluglet::SetWindow  \n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::SetWindow\n"));
    if (view->SetWindow(window) == PR_TRUE) {
 	JNIEnv *env = PlugletEngine::GetJNIEnv();
 	env->CallVoidMethod(jthis,setWindowMID,view->GetJObject());
@ -186,6 +198,8 @@ NS_METHOD Pluglet::SetWindow(nsPluginWindow* window) {
 }

 NS_METHOD Pluglet::Print(nsPluginPrint* platformPrint) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("Pluglet::Print; stub\n"));
    //nb
    return NS_OK;
 }
--- a/java/plugins/src/PlugletEngine.cpp
+++ b/java/plugins/src/PlugletEngine.cpp
@ -25,6 +25,7 @@
 #include "PlugletManager.h"
 #include "nsIGenericFactory.h"
 #include "nsIModule.h"
+#include "PlugletLog.h"

 #ifndef OJI_DISABLE
 #include "ProxyJNI.h"
@ -40,6 +41,7 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
 static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID);

+PRLogModuleInfo* PlugletLog::log = NULL;

 #define PLUGLETENGINE_PROGID \
 "component://netscape/blackwood/pluglet-engine"
@ -91,6 +93,8 @@ NS_METHOD PlugletEngine::CreateInstance(nsISupports *aOuter,
 
 NS_METHOD PlugletEngine::CreatePluginInstance(nsISupports *aOuter, REFNSIID aIID, 
 				const char* aPluginMIMEType, void **aResult) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletEngine::CreatePluginInstance\n"));
    if (!aResult) {
 	return NS_ERROR_FAILURE; 
    }
@ -105,6 +109,8 @@ NS_METHOD PlugletEngine::CreatePluginInstance(nsISupports *aOuter, REFNSIID aIID
 }

 NS_METHOD PlugletEngine::GetMIMEDescription(const char* *result) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletEngine::GetMimeDescription\n"));
    if (!result) {
 	return NS_ERROR_FAILURE;
    }
@ -113,6 +119,8 @@ NS_METHOD PlugletEngine::GetMIMEDescription(const char* *result) {
 }

 NS_METHOD PlugletEngine::GetValue(nsPluginVariable variable, void *value) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletEngine::GetValue; stub\n"));
    //nb ????
    return NS_OK;
 }
@ -143,6 +151,7 @@ char *ToString(jobject obj,JNIEnv *env) {

 PlugletEngine::PlugletEngine() {
    NS_INIT_REFCNT();
+    PlugletLog::log = PR_NewLogModule("pluglets");
    dir = new PlugletsDir();
    engine = this;
    objectCount++;
@ -165,6 +174,8 @@ PlugletEngine::~PlugletEngine(void) {
 JavaVM *PlugletEngine::jvm = NULL;	

 void PlugletEngine::StartJVM(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletEngine::StartJVM\n"));
    JNIEnv *env = NULL;	
    jint res;
    JDK1_1InitArgs vm_args;
@ -174,7 +185,8 @@ void PlugletEngine::StartJVM(void) {
    /* Append USER_CLASSPATH to the default system class path */
    sprintf(classpath, "%s%c%s",
            vm_args.classpath, PATH_SEPARATOR, PR_GetEnv("CLASSPATH"));
-	printf("-- classpath %s\n",classpath);
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	   ("PlugletEngine::StartJVM classpath=%s\n",classpath));
    char **props = new char*[2];
    props[0]="java.compiler=NONE";
    props[1]=0;
@ -183,9 +195,11 @@ void PlugletEngine::StartJVM(void) {
    /* Create the Java VM */	
    res = JNI_CreateJavaVM(&jvm, &env, &vm_args);
    if(res < 0 ) {
-        printf("--JNI_CreateJavaVM failed \n");
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	       ("PlugletEngine::StartJVM JNI_CreateJavaVM failed \n"));
    } else {
-        printf("--PlugletEngine::StartJVM() jvm was started \n");
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	       ("PlugletEngine::StartJVM jvm was started \n"));
    }
 }
 #endif /* OJI_DISABLE */
@ -210,16 +224,18 @@ JNIEnv * PlugletEngine::GetJNIEnv(void) {
   SetSecurityContext(res,securityContext);
 #else  /* OJI_DISABLE */
    if (!jvm) {
-           printf(":) starting jvm\n");
-	   StartJVM();
+	PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	       ("PlugletEngine::GetJNIEnv going to start our own jvm \n"));
+	StartJVM();
   }
   jvm->AttachCurrentThread(&res,NULL);
-   printf("--PluglgetEngine::GetJNIEnv after jvm->Attach \n");
 #endif /* OJI_DISABLE */
   return res;
 }

 jobject PlugletEngine::GetPlugletManager(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletEngine::GetPlugletManager\n"));
    if (!pluginManager) {
        nsresult  res;
        NS_WITH_SERVICE(nsIPluginManager,_pluginManager,kPluginManagerCID,&res);
--- a/java/plugins/src/PlugletFactory.cpp
+++ b/java/plugins/src/PlugletFactory.cpp
@ -23,6 +23,7 @@
 #include "PlugletLoader.h"
 #include "Pluglet.h"
 #include "string.h"
+#include "PlugletLog.h"

 jmethodID PlugletFactory::createPlugletMID = NULL;
 jmethodID PlugletFactory::initializeMID = NULL;  
@ -30,6 +31,8 @@ jmethodID PlugletFactory::shutdownMID = NULL;


 nsresult PlugletFactory::CreatePluginInstance(const char* aPluginMIMEType, void **aResult) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletFactory::CreatePluginInstance\n"));
    if(!aResult
       || Initialize() != NS_OK) {
 	return NS_ERROR_FAILURE;
@ -51,6 +54,8 @@ nsresult PlugletFactory::CreatePluginInstance(const char* aPluginMIMEType, void
 }

 nsresult PlugletFactory::Initialize(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletFactory::Initialize\n"));
    JNIEnv *env = PlugletEngine::GetJNIEnv();
    if(!env) {
        return NS_ERROR_FAILURE;
@ -93,6 +98,8 @@ nsresult PlugletFactory::Initialize(void) {
 }

 nsresult PlugletFactory::Shutdown(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletFactory::Shutdown\n"));
    
    if(!jthis) {
 	return NS_ERROR_FAILURE;
@ -110,6 +117,8 @@ nsresult PlugletFactory::Shutdown(void) {
 }

 nsresult PlugletFactory::GetMIMEDescription(const char* *result) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletFactory::GetMimeDescription\n"));
    if(!result) {
 	return NS_ERROR_FAILURE;
    }
@ -140,6 +149,8 @@ PlugletFactory::~PlugletFactory(void) {
 }

 PlugletFactory * PlugletFactory::Load(const char * path) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletFactory::Load\n"));
    char * mime = PlugletLoader::GetMIMEDescription(path);
    PlugletFactory * result = NULL;
    if (mime) {
--- a/java/plugins/src/PlugletLoader.cpp
+++ b/java/plugins/src/PlugletLoader.cpp
@ -21,6 +21,8 @@
 #include "string.h"
 #include "PlugletEngine.h"
 #include "PlugletLoader.h"
+#include "PlugletLog.h"
+
 jclass PlugletLoader::clazz = NULL;
 jmethodID PlugletLoader::getMIMEDescriptionMID = NULL;
 jmethodID PlugletLoader::getPlugletMID = NULL;
@ -43,6 +45,8 @@ static char *ToString(jobject obj,JNIEnv *env) {
 }

 void PlugletLoader::Initialize(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletLoader::Initialize\n"));
    //nb erors handling
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    clazz = env->FindClass("org/mozilla/pluglet/PlugletLoader");
@ -68,11 +72,15 @@ void PlugletLoader::Initialize(void) {
 }

 void PlugletLoader::Destroy(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletLoader::destroy\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->DeleteGlobalRef(clazz);
 }

 char * PlugletLoader::GetMIMEDescription(const char * path) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletLoader::GetMIMEDescription\n"));
    if (!clazz) {
 	Initialize();
 	if (!clazz) {
@ -103,6 +111,8 @@ char * PlugletLoader::GetMIMEDescription(const char * path) {
 }

 jobject PlugletLoader::GetPluglet(const char * path) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletLoader::GetPluglet\n"));
    if (!clazz) {
 	Initialize();
 	if (!clazz) {
--- a/java/plugins/src/PlugletLog.h
+++ b/java/plugins/src/PlugletLog.h
@ -0,0 +1,8 @@
+#include "prlog.h"
+
+struct PRLodMoguleInfo;
+
+class PlugletLog {
+ public:
+    static PRLogModuleInfo* log;
+};
--- a/java/plugins/src/PlugletStreamListener.cpp
+++ b/java/plugins/src/PlugletStreamListener.cpp
@ -22,6 +22,7 @@
 #include "PlugletEngine.h"
 #include "PlugletStreamInfo.h"
 #include "PlugletInputStream.h"
+#include "PlugletLog.h"

 jmethodID PlugletStreamListener::onStartBindingMID = NULL;
 jmethodID PlugletStreamListener::onDataAvailableMID = NULL;
@ -30,6 +31,8 @@ jmethodID PlugletStreamListener::onStopBindingMID = NULL;
 jmethodID PlugletStreamListener::getStreamTypeMID = NULL;

 void PlugletStreamListener::Initialize(void) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamListener::Initialize\n"));
    JNIEnv * env =  PlugletEngine::GetJNIEnv();
    jclass clazz = env->FindClass("org/mozilla/pluglet/PlugletStreamListener");
    onStartBindingMID = env->GetMethodID(clazz, "onStartBinding","(Lorg/mozilla/pluglet/mozilla/PlugletStreamInfo;)V");
@ -52,6 +55,8 @@ PlugletStreamListener::~PlugletStreamListener(void) {
 }

 NS_METHOD  PlugletStreamListener::OnStartBinding(nsIPluginStreamInfo* pluginInfo) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamListener::OnStartBinding\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->CallVoidMethod(jthis,onStartBindingMID,PlugletStreamInfo::GetJObject(pluginInfo));
    if (env->ExceptionOccurred()) {
@ -62,6 +67,8 @@ NS_METHOD  PlugletStreamListener::OnStartBinding(nsIPluginStreamInfo* pluginInfo
 }
    
 NS_METHOD PlugletStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamListener::OnDataAvailable\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();   
    env->CallVoidMethod(jthis,onDataAvailableMID,PlugletStreamInfo::GetJObject(pluginInfo), 
 			PlugletInputStream::GetJObject(input),(jint)length);
@ -73,6 +80,8 @@ NS_METHOD PlugletStreamListener::OnDataAvailable(nsIPluginStreamInfo* pluginInfo
 }

 NS_METHOD PlugletStreamListener::OnFileAvailable(nsIPluginStreamInfo* pluginInfo, const char* fileName) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamListener::OnFileAvailable\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->CallVoidMethod(jthis,onFileAvailableMID,PlugletStreamInfo::GetJObject(pluginInfo),
 	env->NewStringUTF(fileName));
@ -84,6 +93,8 @@ NS_METHOD PlugletStreamListener::OnFileAvailable(nsIPluginStreamInfo* pluginInfo
 }

 NS_METHOD PlugletStreamListener::OnStopBinding(nsIPluginStreamInfo* pluginInfo, nsresult status) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamListener::OnStopBinding\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    env->CallVoidMethod(jthis,onStopBindingMID,PlugletStreamInfo::GetJObject(pluginInfo),status);
    if (env->ExceptionOccurred()) {
@ -94,6 +105,8 @@ NS_METHOD PlugletStreamListener::OnStopBinding(nsIPluginStreamInfo* pluginInfo,
 }

 NS_METHOD PlugletStreamListener::GetStreamType(nsPluginStreamType *result) {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletStreamListener::GetStreamType\n"));
    JNIEnv * env = PlugletEngine::GetJNIEnv();
    *result = (nsPluginStreamType)env->CallIntMethod(jthis,getStreamTypeMID);
    if (env->ExceptionOccurred()) {
--- a/java/plugins/src/PlugletViewMotif.cpp
+++ b/java/plugins/src/PlugletViewMotif.cpp
@ -37,15 +37,20 @@
 #include "PlugletViewMotif.h"
 #include "PlugletEngine.h"

+#include "PlugletLog.h"

 jclass   PlugletViewMotif::clazz = NULL;
 jmethodID  PlugletViewMotif::initMID = NULL;

 PlugletViewMotif::PlugletViewMotif() {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	            ("PlugletViewMotif.Constructor this=%p\n",this));
    frame = NULL;
    WindowID = 0;
 }
 void PlugletViewMotif::Initialize() {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	   ("PlugletViewMotif.Initialize\n"));
    JNIEnv *env = PlugletEngine::GetJNIEnv();
    clazz = env->FindClass("sun/awt/motif/MEmbeddedFrame");
    if (!clazz) {
@ -70,7 +75,8 @@ extern jobject awt_lock;
 extern Display *awt_display;

 PRBool PlugletViewMotif::SetWindow(nsPluginWindow* win) {
-    printf("--PlugletViewMotif::SetWindow \n");
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	              ("PlugletViewMotif.SetWindow this=%p\n",this));
    JNIEnv *env = PlugletEngine::GetJNIEnv();
    if(!clazz) {
        Initialize();
@ -81,7 +87,8 @@ PRBool PlugletViewMotif::SetWindow(nsPluginWindow* win) {
    if (!win 
        || !win->window) {
        if (win && !win->window) {
-            printf("--PlugletViewMotif win->window = NULL. We have a bug in plugin module \n");
+	    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	              ("PlugletViewMotif.SetWindow  win->window = NULL. We have a bug in plugin module. this=%p\n",this));
        }
        if (frame) {
            env->DeleteGlobalRef(frame);
@ -145,9 +152,7 @@ PRBool PlugletViewMotif::SetWindow(nsPluginWindow* win) {
        }
        
    }
-    printf("--before new frame\n");
    frame = env->NewObject(clazz,initMID,(jlong)w);
-    printf("--after new frame\n");
    if(frame) {
        frame = env->NewGlobalRef(frame);
        if (env->ExceptionOccurred()) {
--- a/java/plugins/src/PlugletsDir.cpp
+++ b/java/plugins/src/PlugletsDir.cpp
@ -20,6 +20,7 @@
 */
 #include"PlugletsDir.h"
 #include "prenv.h"
+#include "PlugletLog.h"

 PlugletsDir::PlugletsDir(void) {
    list = NULL;
@ -35,6 +36,8 @@ PlugletsDir::~PlugletsDir(void) {
 }

 void PlugletsDir::LoadPluglets() {
+    PR_LOG(PlugletLog::log, PR_LOG_DEBUG,
+	    ("PlugletsDir::LoadPluglets\n"));
    if (!list) {
 	list = new List();
 	char * path = PR_GetEnv("PLUGLET");