This checkin enables finding out the request method and response status
of a URL_LOAD event. I'm still working on getting the request body via
the nsIUploadChannel interface. Next step will be to get that working.
I'm currently running into problems where the END_URL event for a POST
doesn't have a status. I think this is because I'm using the
Navigation.post() method rather than simulating a user post by pressing
a form submit button.
A classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeInputStream.java
A src_moz/NativeInputStreamImpl.cpp
- Class to enable reading the post body from the request.
M build.xml
- add NativeInputStream to JNI generation
M classes_spec/org/mozilla/webclient/PageInfoListener.java
* <p>This {@link DocumentLoadListener} subclass adds the ability to get
* detailed information on each event. </p>
*
* <p>The <code>eventData</code> property of the
* <code>DocumentLoadEvent</code> instance will be a
* <code>java.util.Map</code>. The following entries may be present in
* this map for the following <code>*_EVENT_MASK</code> types in
* <code>DocumentLoadEvent</code>.</p>
*
* <dl>
*
* <dt>For all <code>*_EVENT_MASK</code> types</dt>
*
* <dd><p>the map will contain an entry under the key "<code>URI</code>"
* without the quotes. This will be the fully qualified URI for the
* event. </p></dd>
*
* <dt>For <code>START_URL_LOAD</code> type</dt>
*
* <dd><p>The map will contain an entry under the key
* "<code>method</code>" without the quotes. This will be the request
* method for this event. The map will also contain an entry under the
* key "<code>headers</code>". This entry will be a
* <code>java.util.Map</code> of all the request headers.</p></dd>
*
* <dt>For <code>END_URL_LOAD</code> type</dt>
*
* <dd><p>The map will contain an entry under the key
* "<code>method</code>" without the quotes. This will be the request
* method for this event. The map will contain an entry under the key
* "<code>status</code>" without the quotes. This will be the response
* status string from the server, such as "<code>200 OK</code>". The
* map will also contain an entry under the key "<code>headers</code>".
* This entry will be a <code>java.util.Map</code> of all the response
* headers.</p></dd>
*
* </dl>
M src_moz/EmbedProgress.cpp
- leverage nsIHttpChannel methods to get request method, response
status, and post body.
M src_moz/Makefile.in
- add NativeInputStream
M src_share/jni_util.cpp
M src_share/jni_util.h
- new constants
- add variant of ThrowExceptionToJava that takes the exception class name.
M test/automated/src/classes/org/mozilla/webclient/DocumentLoadListenerTest.java
- new test content. Post related content commented out.
git-svn-id: svn://10.0.0.236/trunk@169991 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -75,6 +75,9 @@ jobject ONE_VALUE;
|
||||
jobject TWO_VALUE;
|
||||
jobject URI_VALUE;
|
||||
jobject HEADERS_VALUE;
|
||||
jobject METHOD_VALUE;
|
||||
jobject STATUS_VALUE;
|
||||
jobject REQUEST_BODY_VALUE;
|
||||
jobject MESSAGE_VALUE;
|
||||
jobject BM_ADD_DATE_VALUE;
|
||||
jobject BM_LAST_MODIFIED_DATE_VALUE;
|
||||
@@ -270,6 +273,21 @@ jboolean util_InitStringConstants()
|
||||
::util_NewStringUTF(env, "headers")))) {
|
||||
return JNI_FALSE;
|
||||
}
|
||||
if (nsnull == (STATUS_VALUE =
|
||||
::util_NewGlobalRef(env, (jobject)
|
||||
::util_NewStringUTF(env, "status")))) {
|
||||
return JNI_FALSE;
|
||||
}
|
||||
if (nsnull == (REQUEST_BODY_VALUE =
|
||||
::util_NewGlobalRef(env, (jobject)
|
||||
::util_NewStringUTF(env, "requestBody")))) {
|
||||
return JNI_FALSE;
|
||||
}
|
||||
if (nsnull == (METHOD_VALUE =
|
||||
::util_NewGlobalRef(env, (jobject)
|
||||
::util_NewStringUTF(env, "method")))) {
|
||||
return JNI_FALSE;
|
||||
}
|
||||
if (nsnull == (MESSAGE_VALUE =
|
||||
::util_NewGlobalRef(env, (jobject)
|
||||
::util_NewStringUTF(env, "message")))) {
|
||||
@@ -351,11 +369,17 @@ jboolean util_StringConstantsAreInitialized()
|
||||
}
|
||||
|
||||
void util_ThrowExceptionToJava (JNIEnv * env, const char * message)
|
||||
{
|
||||
util_ThrowExceptionToJava(env, "java/lang/RuntimeException", message);
|
||||
}
|
||||
|
||||
void util_ThrowExceptionToJava (JNIEnv * env, const char * exceptionClass,
|
||||
const char * message)
|
||||
{
|
||||
if (env->ExceptionOccurred()) {
|
||||
env->ExceptionClear();
|
||||
}
|
||||
jclass excCls = env->FindClass("java/lang/RuntimeException");
|
||||
jclass excCls = env->FindClass(exceptionClass);
|
||||
|
||||
if (excCls == 0) { // Unable to find the exception class, give up.
|
||||
if (env->ExceptionOccurred())
|
||||
|
||||
Reference in New Issue
Block a user