svn commit: r1222674 [1/2] - in /uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook: ./ images/tools/tools.textmarker/
Author: pkluegl Date: Fri Dec 23 13:25:01 2011 New Revision: 1222674 URL: http://svn.apache.org/viewvc?rev=1222674view=rev Log: UIMA-2285 added remaining old and out-dated documentation. Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_preferences.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_result.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_testing_desc_2_resize (1).png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_testing_desc_2_resize.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_testing_desc_3_resize.png (with props) uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/folder_struc_sep_desc_cut.png (with props) Modified: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/tools.textmarker.xml Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png?rev=1222674view=auto == Binary file - no diff available. Propchange: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Query.png -- svn:mime-type = application/octet-stream Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png?rev=1222674view=auto == Binary file - no diff available. Propchange: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_Result_TP_desc_close_cut.png -- svn:mime-type = application/octet-stream Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png?rev=1222674view=auto == Binary file - no diff available. Propchange: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_all_unavailable.png -- svn:mime-type = application/octet-stream Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png?rev=1222674view=auto == Binary file - no diff available. Propchange: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_main.png -- svn:mime-type = application/octet-stream Added: uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_preferences.png URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uima-docbook-textmarker/src/docbook/images/tools/tools.textmarker/Screenshot_preferences.png?rev=1222674view=auto == Binary file - no diff available. Propchange:
svn commit: r1222727 - /uima/uimacpp/trunk/scriptators/ThreadAnnotator.h
Author: bhavani
Date: Fri Dec 23 16:22:25 2011
New Revision: 1222727
URL: http://svn.apache.org/viewvc?rev=1222727view=rev
Log:
UIMA-1912 updated for GCC 4.3 compatibility
Modified:
uima/uimacpp/trunk/scriptators/ThreadAnnotator.h
Modified: uima/uimacpp/trunk/scriptators/ThreadAnnotator.h
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/scriptators/ThreadAnnotator.h?rev=1222727r1=1222726r2=1222727view=diff
==
--- uima/uimacpp/trunk/scriptators/ThreadAnnotator.h (original)
+++ uima/uimacpp/trunk/scriptators/ThreadAnnotator.h Fri Dec 23 16:22:25 2011
@@ -20,7 +20,6 @@
#include apr_thread_proc.h
#include apr_thread_mutex.h
#include apr_thread_cond.h
-
template class _Annotator
class ThreadAnnotator : public uima::Annotator {
_Annotator *child;
@@ -120,7 +119,7 @@ public:
apr_sleep(1000);
apr_thread_mutex_lock(mutex);
if (!threadReady) {
- cerr WARNING: ThreadAnnotator worker thread not ready! endl;
+ std::cerr WARNING: ThreadAnnotator worker thread not ready!
std::endl;
}
apr_thread_mutex_unlock(mutex);
}
