diff --git a/solr/build.xml b/solr/build.xml
index a73733704..3e21d4a20 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -8,7 +8,7 @@
=========================================== -->
-
+
@@ -20,7 +20,8 @@
-deploy - Deploy solr service for use by vitro.
+deploy - Deploy solr service for use by vitro.
+makeSolrjClientJar - Isolate solrj libraries in single jar.
@@ -88,5 +89,26 @@ deploy - Deploy solr service for use by vitro.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/solrjClientLibs/apache-solr-core-3.1.0.jar b/solr/solrjClientLibs/apache-solr-core-3.1.0.jar
new file mode 100644
index 000000000..00a842e4b
Binary files /dev/null and b/solr/solrjClientLibs/apache-solr-core-3.1.0.jar differ
diff --git a/solr/solrjClientLibs/apache-solr-solrj-3.1.0.jar b/solr/solrjClientLibs/apache-solr-solrj-3.1.0.jar
new file mode 100644
index 000000000..058d27350
Binary files /dev/null and b/solr/solrjClientLibs/apache-solr-solrj-3.1.0.jar differ
diff --git a/solr/solrjClientLibs/commons-codec-1.4.jar b/solr/solrjClientLibs/commons-codec-1.4.jar
new file mode 100644
index 000000000..458d432da
Binary files /dev/null and b/solr/solrjClientLibs/commons-codec-1.4.jar differ
diff --git a/solr/solrjClientLibs/commons-httpclient-3.1.jar b/solr/solrjClientLibs/commons-httpclient-3.1.jar
new file mode 100644
index 000000000..7c59774ae
Binary files /dev/null and b/solr/solrjClientLibs/commons-httpclient-3.1.jar differ
diff --git a/solr/solrjClientLibs/commons-io-1.4.jar b/solr/solrjClientLibs/commons-io-1.4.jar
new file mode 100644
index 000000000..133dc6cb3
Binary files /dev/null and b/solr/solrjClientLibs/commons-io-1.4.jar differ
diff --git a/solr/solrjClientLibs/geronimo-stax-api_1.0_spec-1.0.1.jar b/solr/solrjClientLibs/geronimo-stax-api_1.0_spec-1.0.1.jar
new file mode 100644
index 000000000..ab1ee3ba6
Binary files /dev/null and b/solr/solrjClientLibs/geronimo-stax-api_1.0_spec-1.0.1.jar differ
diff --git a/solr/solrjClientLibs/hs_err_pid16825.log b/solr/solrjClientLibs/hs_err_pid16825.log
new file mode 100644
index 000000000..d9878d46b
--- /dev/null
+++ b/solr/solrjClientLibs/hs_err_pid16825.log
@@ -0,0 +1,584 @@
+#
+# An unexpected error has been detected by Java Runtime Environment:
+#
+# java.lang.OutOfMemoryError: requested 16 bytes for CHeapObj-new. Out of swap space?
+#
+# Internal Error (allocation.inline.hpp:42), pid=16825, tid=312474480
+# Error: CHeapObj-new
+#
+# Java VM: Java HotSpot(TM) Server VM (11.0-b16 mixed mode linux-x86)
+# If you would like to submit a bug report, please visit:
+# http://java.sun.com/webapps/bugreport/crash.jsp
+#
+
+--------------- T H R E A D ---------------
+
+Current thread (0x09748800): VMThread [stack: 0x1297f000,0x12a00000] [id=16830]
+
+Stack: [0x1297f000,0x12a00000], sp=0x129fee00, free space=511k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V [libjvm.so+0x6064fb]
+V [libjvm.so+0x2d37f1]
+V [libjvm.so+0x19ad85]
+V [libjvm.so+0x474b8e]
+V [libjvm.so+0x477b0b]
+V [libjvm.so+0x475b39]
+V [libjvm.so+0x4ecceb]
+V [libjvm.so+0x5158b7]
+V [libjvm.so+0x477baf]
+V [libjvm.so+0x6146e7]
+V [libjvm.so+0x613cfc]
+V [libjvm.so+0x613ed1]
+V [libjvm.so+0x613aaf]
+V [libjvm.so+0x506709]
+C [libpthread.so.0+0x596e]
+
+VM_Operation (0x119fe5d0): HeapIterateOperation, mode: safepoint, requested by thread 0x0994fc00
+
+
+--------------- P R O C E S S ---------------
+
+Java Threads: ( => current thread )
+ 0x09d48000 JavaThread "http-8080-5" daemon [_thread_blocked, id=16892, stack(0x0eb0d000,0x0eb5e000)]
+ 0x09d47800 JavaThread "http-8080-4" daemon [_thread_blocked, id=16891, stack(0x0eb5e000,0x0ebaf000)]
+ 0x09d47400 JavaThread "http-8080-3" daemon [_thread_blocked, id=16890, stack(0x0ebaf000,0x0ec00000)]
+ 0x09d46c00 JavaThread "http-8080-2" daemon [_thread_blocked, id=16887, stack(0x11b7a000,0x11bcb000)]
+ 0x10032c00 JavaThread "TP-Monitor" daemon [_thread_blocked, id=16886, stack(0x1125e000,0x112af000)]
+ 0x0f50bc00 JavaThread "TP-Processor4" daemon [_thread_in_native, id=16885, stack(0x112af000,0x11300000)]
+ 0x0f797800 JavaThread "TP-Processor3" daemon [_thread_blocked, id=16884, stack(0x11406000,0x11457000)]
+ 0x10095400 JavaThread "TP-Processor2" daemon [_thread_blocked, id=16883, stack(0x11457000,0x114a8000)]
+ 0x1001bc00 JavaThread "TP-Processor1" daemon [_thread_blocked, id=16882, stack(0x114a8000,0x114f9000)]
+ 0x09a43c00 JavaThread "http-8080-1" daemon [_thread_blocked, id=16881, stack(0x1170d000,0x1175e000)]
+ 0x10034c00 JavaThread "http-8080-Acceptor-0" daemon [_thread_in_native, id=16880, stack(0x1175e000,0x117af000)]
+ 0x0f797000 JavaThread "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon [_thread_blocked, id=16879, stack(0x117af000,0x11800000)]
+ 0x0fa87400 JavaThread "VClassGroupCache.RebuildGroupCacheThread" daemon [_thread_blocked, id=16874, stack(0x0f245000,0x0f296000)]
+ 0x0f81fc00 JavaThread "IndexBuilder" [_thread_blocked, id=16867, stack(0x0f42c000,0x0f47d000)]
+ 0x0f5e2800 JavaThread "Timer-0" daemon [_thread_blocked, id=16858, stack(0x10c05000,0x10c56000)]
+ 0x10ec1c00 JavaThread "pool-3-thread-1" [_thread_blocked, id=16857, stack(0x1191b000,0x1196c000)]
+ 0x1111a000 JavaThread "pool-1-thread-1" [_thread_blocked, id=16852, stack(0x125af000,0x12600000)]
+ 0x0994fc00 JavaThread "YJPAgent-RequestListener" daemon [_thread_blocked, id=16842, stack(0x119af000,0x11a00000)]
+ 0x09b6ec00 JavaThread "YJPAgent-Telemetry" daemon [_thread_blocked, id=16841, stack(0x11faf000,0x12000000)]
+ 0x12609000 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=16839, stack(0x123ba000,0x1240b000)]
+ 0x12607c00 JavaThread "CompilerThread1" daemon [_thread_blocked, id=16838, stack(0x1240b000,0x1248c000)]
+ 0x128de000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=16837, stack(0x1248c000,0x1250d000)]
+ 0x128e4800 JavaThread "YJPAgent-OOMESnapshotDetector" daemon [_thread_in_native, id=16836, stack(0x1250d000,0x1255e000)]
+ 0x128e0400 JavaThread "YJPAgent-CPUSampler" daemon [_thread_blocked, id=16835, stack(0x1255e000,0x125af000)]
+ 0x128e0c00 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=16833, stack(0x1271f000,0x12770000)]
+ 0x12801000 JavaThread "Finalizer" daemon [_thread_blocked, id=16832, stack(0x127af000,0x12800000)]
+ 0x097cf400 JavaThread "Reference Handler" daemon [_thread_blocked, id=16831, stack(0x12929000,0x1297a000)]
+ 0x096c4800 JavaThread "main" [_thread_in_native, id=16826, stack(0xb7534000,0xb7585000)]
+
+Other Threads:
+=>0x09748800 VMThread [stack: 0x1297f000,0x12a00000] [id=16830]
+ 0x1260a400 WatcherThread [stack: 0x12339000,0x123ba000] [id=16840]
+
+VM state:at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
+[0x096c93b8] UNKNOWN - owner thread: 0x09748800
+[0x096c97c8] UNKNOWN - owner thread: 0x0994fc00
+
+Heap
+ PSYoungGen total 185664K, used 96829K [0xa2480000, 0xb3a40000, 0xb3a40000)
+ eden space 97280K, 36% used [0xa2480000,0xa471bb30,0xa8380000)
+ from space 88384K, 69% used [0xae3f0000,0xb1fe3c40,0xb3a40000)
+ to space 93568K, 0% used [0xa8380000,0xa8380000,0xadee0000)
+ PSOldGen total 1222912K, used 1034292K [0x17640000, 0x62080000, 0xa2480000)
+ object space 1222912K, 84% used [0x17640000,0x5684d2b8,0x62080000)
+ PSPermGen total 40576K, used 34605K [0x13640000, 0x15de0000, 0x17640000)
+ object space 40576K, 85% used [0x13640000,0x1580b630,0x15de0000)
+
+Dynamic libraries:
+00010000-06000000 rwxp 00000000 00:00 0
+06000000-06676000 r-xp 00000000 08:09 5250207 /home/opt/jdk1.6.0_11/jre/lib/i386/server/libjvm.so
+06676000-066bb000 rwxp 00675000 08:09 5250207 /home/opt/jdk1.6.0_11/jre/lib/i386/server/libjvm.so
+066bb000-06ade000 rwxp 00000000 00:00 0
+06ade000-08048000 rwxp 00000000 00:00 0
+08048000-08052000 r-xp 00000000 08:09 5254499 /home/opt/jdk1.6.0_11/bin/java
+08052000-08053000 rwxp 00009000 08:09 5254499 /home/opt/jdk1.6.0_11/bin/java
+08053000-0e684000 rwxp 00000000 00:00 0 [heap]
+0e684000-0eb0d000 rwxp 00000000 00:00 0
+0eb0d000-0eb10000 ---p 00000000 00:00 0
+0eb10000-0eb5e000 rwxp 00000000 00:00 0
+0eb5e000-0eb61000 ---p 00000000 00:00 0
+0eb61000-0ebaf000 rwxp 00000000 00:00 0
+0ebaf000-0ebb2000 ---p 00000000 00:00 0
+0ebb2000-0ec00000 rwxp 00000000 00:00 0
+0ec00000-0ed00000 rwxp 00000000 00:00 0
+0ed00000-0ed16000 rwxp 00000000 00:00 0
+0ed16000-0ed20000 r-xs 00052000 08:04 825966 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xstream-1.2.2.jar
+0ed20000-0ed25000 r-xs 00076000 08:04 825930 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xsdlib.jar
+0ed25000-0ed27000 r-xs 00005000 08:04 826024 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
+0ed27000-0ed2f000 r-xs 00028000 08:04 826017 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xml-apis.jar
+0ed2f000-0ed45000 r-xs 00110000 08:04 826047 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xercesImpl.jar
+0ed45000-0ed48000 r-xs 0001e000 08:04 826041 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xbean-spring-2.5.jar
+0ed48000-0ed84000 r-xs 00248000 08:04 826016 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xbean-2.1.0.jar
+0ed84000-0eda5000 r-xs 00265000 08:04 825986 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xalan.jar
+0eda5000-0edab000 r-xs 0006e000 08:04 825999 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/wstx-asl-3.0.0.jar
+0edab000-0edaf000 r-xs 0001c000 08:04 826026 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/wsdl4j-1.5.2.jar
+0edaf000-0edb2000 r-xs 0001f000 08:04 825950 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/trippi-1.3.2-core.jar
+0edb2000-0edbb000 r-xs 00060000 08:04 826060 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/tdb-0.8.7.jar
+0edbb000-0edbd000 r-xs 0000a000 08:04 826032 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/taglibs-string.jar
+0edbd000-0edbe000 r-xs 00003000 08:04 826076 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/taglibs-random.jar
+0edbe000-0edbf000 r-xs 00006000 08:04 825980 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/taglibs-mailer.jar
+0edbf000-0edc1000 r-xs 00005000 08:04 826001 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/stax-api-1.0.1.jar
+0edc1000-0edfe000 r-xs 00294000 08:04 825961 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/spring2.5.6.jar
+0edfe000-0ee00000 r-xs 00003000 08:04 826064 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sparqltag.jar
+0ee00000-0ee2e000 r-xs 00276000 08:04 825473 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/solrjClient.jar
+0ee2e000-0ee2f000 r-xs 00002000 08:04 825973 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/slf4j-log4j12-1.5.6.jar
+0ee2f000-0ee31000 r-xs 00004000 08:04 825962 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/slf4j-api-1.5.6.jar
+0ee31000-0ee37000 r-xs 00040000 08:04 826055 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-rdbms-2.2.3.jar
+0ee37000-0ee3a000 r-xs 00016000 08:04 826003 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-nativerdf-2.2.3.jar
+0ee3a000-0ee3c000 r-xs 0000c000 08:04 826071 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-memory-2.2.3.jar
+0ee3c000-0ee3e000 r-xs 00004000 08:04 825991 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-inferencer-2.2.3.jar
+0ee3e000-0ee40000 r-xs 00007000 08:04 825985 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-api-2.2.3.jar
+0ee40000-0ee41000 r-xs 00000000 08:04 825983 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-runtime-2.2.3.jar
+0ee41000-0ee43000 r-xs 00003000 08:04 826052 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-turtle-2.2.3.jar
+0ee43000-0ee44000 r-xs 00002000 08:04 826043 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-trix-2.2.3.jar
+0ee44000-0ee45000 r-xs 00001000 08:04 825994 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-trig-2.2.3.jar
+0ee45000-0ee47000 r-xs 00007000 08:04 826028 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-rdfxml-2.2.3.jar
+0ee47000-0ee49000 r-xs 00002000 08:04 825949 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-ntriples-2.2.3.jar
+0ee49000-0ee4b000 r-xs 00000000 08:04 826040 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-n3-2.2.3.jar
+0ee4b000-0ee4c000 r-xs 00004000 08:04 826018 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-api-2.2.3.jar
+0ee4c000-0ee4e000 r-xs 00004000 08:04 825935 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-sail-2.2.3.jar
+0ee4e000-0ee4f000 r-xs 00005000 08:04 825953 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-manager-2.2.3.jar
+0ee4f000-0ee51000 r-xs 00003000 08:04 825946 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-http-2.2.3.jar
+0ee51000-0ee53000 r-xs 00003000 08:04 825996 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-event-2.2.3.jar
+0ee53000-0ee54000 r-xs 00002000 08:04 825937 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-dataset-2.2.3.jar
+0ee54000-0ee56000 r-xs 00002000 08:04 825978 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-contextaware-2.2.3.jar
+0ee56000-0ee58000 r-xs 00007000 08:04 826065 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-api-2.2.3.jar
+0ee58000-0ee59000 r-xs 00001000 08:04 826031 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-text-2.2.3.jar
+0ee59000-0ee5b000 r-xs 00003000 08:04 825970 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-sparqlxml-2.2.3.jar
+0ee5b000-0ee5c000 r-xs 00001000 08:04 825993 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-sparqljson-2.2.3.jar
+0ee5c000-0ee5e000 r-xs 00002000 08:04 826050 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-binary-2.2.3.jar
+0ee5e000-0ee5f000 r-xs 00003000 08:04 825933 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-api-2.2.3.jar
+0ee5f000-0ee62000 r-xs 0001e000 08:04 826013 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryparser-sparql-2.2.3.jar
+0ee62000-0ee66000 r-xs 00020000 08:04 826025 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryparser-serql-2.2.3.jar
+0ee66000-0ee67000 r-xs 00001000 08:04 825984 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryparser-api-2.2.3.jar
+0ee67000-0ee6a000 r-xs 00013000 08:04 826063 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryalgebra-model-2.2.3.jar
+0ee6a000-0ee6e000 r-xs 00015000 08:04 825924 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryalgebra-evaluation-2.2.3.jar
+0ee6e000-0ee70000 r-xs 00008000 08:04 826053 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-query-2.2.3.jar
+0ee70000-0ee73000 r-xs 0000b000 08:04 825948 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-model-2.2.3.jar
+0ee73000-0ee75000 r-xs 00009000 08:04 825957 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-http-server-spring-2.2.3.jar
+0ee75000-0ee77000 r-xs 00004000 08:04 826023 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-http-protocol-2.2.3.jar
+0ee77000-0ee78000 r-xs 00003000 08:04 826068 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-http-client-2.2.3.jar
+0ee78000-0ee79000 r-xs 00007000 08:04 826056 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-console-2.2.3.jar
+0ee79000-0ee85000 r-xs 00071000 08:04 826051 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sdb-1.3.2.jar
+0ee85000-0ee8a000 r-xs 00015000 08:04 825969 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sdb-1.3.2-tests.jar
+0ee8a000-0eea6000 r-xs 0051b000 08:04 825952 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/saxon9he.jar
+0eea6000-0eea7000 r-xs 00004000 08:04 825995 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/saaj.jar
+0eea7000-0eea9000 r-xs 00004000 08:04 825968 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/rsslib4j-0.2.jar
+0eea9000-0eeac000 r-xs 00018000 08:04 826030 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/rowset-20040728-v101.jar
+0eeac000-0eead000 r-xs 00004000 08:04 826049 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/relaxngDatatype.jar
+0eead000-0eeb4000 r-xs 00077000 08:04 825944 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-test.jar
+0eeb4000-0eeba000 r-xs 0002d000 08:04 826005 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-rules.jar
+0eeba000-0eec1000 r-xs 0005c000 08:04 825932 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-query.jar
+0eec1000-0eec3000 r-xs 00010000 08:04 826007 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-pellint.jar
+0eec3000-0eec5000 r-xs 00018000 08:04 826009 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-owlapiv3.jar
+0eec5000-0eec7000 r-xs 00010000 08:04 826020 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-owlapi.jar
+0eec7000-0eec8000 r-xs 0000d000 08:04 826067 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-modularity.jar
+0eec8000-0eecd000 r-xs 00029000 08:04 825934 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-jena.jar
+0eecd000-0eecf000 r-xs 00006000 08:04 826034 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-explanation.jar
+0eecf000-0eed0000 r-xs 0000c000 08:04 825979 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-el.jar
+0eed0000-0eed1000 r-xs 00006000 08:04 825990 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-dig.jar
+0eed1000-0eed6000 r-xs 0003c000 08:04 826000 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-datatypes.jar
+0eed6000-0eedf000 r-xs 00090000 08:04 826027 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-core.jar
+0eedf000-0eeed000 r-xs 00190000 08:04 825987 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/ojdbc14_g.jar
+0eeed000-0ef00000 r-xs 000fe000 08:04 825936 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/lucene-core-2.9.3.jar
+0ef00000-0efff000 rwxp 00000000 00:00 0
+0efff000-0f000000 ---p 00000000 00:00 0
+0f000000-0f0fa000 rwxp 00000000 00:00 0
+0f0fa000-0f100000 ---p 00000000 00:00 0
+0f100000-0f1fd000 rwxp 00000000 00:00 0
+0f1fd000-0f200000 ---p 00000000 00:00 0
+0f200000-0f205000 rwxp 00000000 00:00 0
+0f205000-0f207000 r-xs 00011000 08:04 825939 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-cli.jar
+0f207000-0f20c000 r-xs 0002d000 08:04 826045 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/lucene-analyzers-2.9.3.jar
+0f20c000-0f213000 r-xs 00053000 08:04 826002 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/log4j-1.2.14.jar
+0f213000-0f222000 r-xs 00071000 08:04 826035 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/joda-time-1.4.jar
+0f222000-0f245000 r-xs 001ad000 08:04 826038 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3.jar
+0f245000-0f248000 ---p 00000000 00:00 0
+0f248000-0f41f000 rwxp 00000000 00:00 0
+0f41f000-0f425000 r-xs 00059000 08:04 825959 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/mail-1.4.jar
+0f425000-0f42c000 r-xs 0003c000 08:04 826011 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/ldap.jar
+0f42c000-0f42f000 ---p 00000000 00:00 0
+0f42f000-0f500000 rwxp 00000000 00:00 0
+0f500000-0f5fc000 rwxp 00000000 00:00 0
+0f5fc000-0f600000 ---p 00000000 00:00 0
+0f600000-0f6fb000 rwxp 00000000 00:00 0
+0f6fb000-0f700000 ---p 00000000 00:00 0
+0f700000-0f7ff000 rwxp 00000000 00:00 0
+0f7ff000-0f800000 ---p 00000000 00:00 0
+0f800000-0f8ff000 rwxp 00000000 00:00 0
+0f8ff000-0f900000 ---p 00000000 00:00 0
+0f900000-0f9fc000 rwxp 00000000 00:00 0
+0f9fc000-0fa00000 ---p 00000000 00:00 0
+0fa00000-0fb00000 rwxp 00000000 00:00 0
+0fb00000-0fbf0000 rwxp 00000000 00:00 0
+0fbf0000-0fc00000 ---p 00000000 00:00 0
+0fc00000-0fd00000 rwxp 00000000 00:00 0
+0fd00000-0fdfe000 rwxp 00000000 00:00 0
+0fdfe000-0fe00000 ---p 00000000 00:00 0
+0fe00000-0ff00000 rwxp 00000000 00:00 0
+0ff00000-0ffff000 rwxp 00000000 00:00 0
+0ffff000-10000000 ---p 00000000 00:00 0
+10000000-100fc000 rwxp 00000000 00:00 0
+100fc000-10100000 ---p 00000000 00:00 0
+10100000-101e5000 rwxp 00000000 00:00 0
+101e5000-10200000 ---p 00000000 00:00 0
+10200000-102fd000 rwxp 00000000 00:00 0
+102fd000-10300000 ---p 00000000 00:00 0
+10300000-103e1000 rwxp 00000000 00:00 0
+103e1000-10400000 ---p 00000000 00:00 0
+10400000-104e2000 rwxp 00000000 00:00 0
+104e2000-10500000 ---p 00000000 00:00 0
+10500000-105ff000 rwxp 00000000 00:00 0
+105ff000-10600000 ---p 00000000 00:00 0
+10600000-106ed000 rwxp 00000000 00:00 0
+106ed000-10700000 ---p 00000000 00:00 0
+10700000-107f7000 rwxp 00000000 00:00 0
+107f7000-10800000 ---p 00000000 00:00 0
+10800000-108fb000 rwxp 00000000 00:00 0
+108fb000-10900000 ---p 00000000 00:00 0
+10900000-109fb000 rwxp 00000000 00:00 0
+109fb000-10a00000 ---p 00000000 00:00 0
+10a00000-10afc000 rwxp 00000000 00:00 0
+10afc000-10b00000 ---p 00000000 00:00 0
+10b00000-10bff000 rwxp 00000000 00:00 0
+10bff000-10c00000 ---p 00000000 00:00 0
+10c00000-10c01000 rwxp 00000000 00:00 0
+10c01000-10c03000 r-xs 00038000 08:04 825976 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/mysql-connector-java-3.0.16-ga-bin.jar
+10c03000-10c05000 r-xs 0000a000 08:04 826069 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/lucene-highlighter-2.9.3.jar
+10c05000-10c08000 ---p 00000000 00:00 0
+10c08000-10c56000 rwxp 00000000 00:00 0
+10c56000-10c64000 r-xs 0065f000 08:09 5250039 /home/opt/jdk1.6.0_11/jre/lib/charsets.jar
+10c64000-10c6a000 r-xs 00034000 08:04 826014 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/junit-4.8.1.jar
+10c6a000-10c71000 r-xs 00028000 08:04 826073 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jgrapht-jdk1.5.jar
+10c71000-10c7a000 r-xs 00065000 08:04 826004 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jga-0.8.jar
+10c7a000-10c93000 r-xs 00157000 08:04 826010 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3-tests.jar
+10c93000-10c9e000 r-xs 000e7000 08:04 826019 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3-test-sources.jar
+10c9e000-10cb7000 r-xs 0021e000 08:04 825971 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3-sources.jar
+10cb7000-10cb9000 r-xs 00023000 08:04 825954 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jdom.jar
+10cb9000-10cbc000 r-xs 00023000 08:04 826070 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jdom-1.0.jar
+10cbc000-10cbe000 r-xs 00003000 08:04 826054 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jcl-over-slf4j-1.5.5.jar
+10cbe000-10cc0000 r-xs 0001c000 08:04 826072 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jcalendar.jar
+10cc0000-10cc2000 r-xs 00006000 08:04 825956 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jaxrpc.jar
+10cc2000-10cc4000 r-xs 0000e000 08:04 825974 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jakarta-oro-2.0.8.jar
+10cc4000-10ccd000 r-xs 00058000 08:04 825981 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jakarta-jstl1.2-standard.jar
+10ccd000-10ccf000 r-xs 00004000 08:04 826039 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jakarta-jstl1.2-jstl.jar
+10ccf000-10ce3000 r-xs 001bd000 08:04 825945 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jai_core.jar
+10ce3000-10ce7000 r-xs 0003c000 08:04 825998 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jai_codec.jar
+10ce7000-10d00000 r-xs 002fd000 08:04 825972 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/icu4j-3.4.4.jar
+10d00000-10dff000 rwxp 00000000 00:00 0
+10dff000-10e00000 ---p 00000000 00:00 0
+10e00000-10ef6000 rwxp 00000000 00:00 0
+10ef6000-10f00000 ---p 00000000 00:00 0
+10f00000-10ff3000 rwxp 00000000 00:00 0
+10ff3000-11000000 ---p 00000000 00:00 0
+11000000-110fc000 rwxp 00000000 00:00 0
+110fc000-11100000 ---p 00000000 00:00 0
+11100000-111fd000 rwxp 00000000 00:00 0
+111fd000-11200000 ---p 00000000 00:00 0
+11200000-11203000 r-xs 0003a000 08:04 825989 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jtidy-8.0-20060801.124516-2.jar
+11203000-11206000 r-xs 00023000 08:04 825960 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/iri-0.8.jar
+11206000-11214000 r-xs 00170000 08:04 826057 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/iText-5.0.2.jar
+11214000-11218000 r-xs 00025000 08:04 826061 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/gson-1.4.jar
+11218000-11228000 r-xs 000d2000 08:04 826015 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/freemarker.jar
+11228000-11239000 r-xs 000ce000 08:04 826058 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/fedora-client.jar
+11239000-1125e000 r-xs 001c8000 08:04 826033 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/arq-2.8.5.jar
+1125e000-11261000 ---p 00000000 00:00 0
+11261000-112af000 rwxp 00000000 00:00 0
+112af000-112b2000 ---p 00000000 00:00 0
+112b2000-11300000 rwxp 00000000 00:00 0
+11300000-113e1000 rwxp 00000000 00:00 0
+113e1000-11400000 ---p 00000000 00:00 0
+11400000-11406000 r-xs 0004c000 08:04 826036 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/dwr-2.0.M2.8.jar
+11406000-11409000 ---p 00000000 00:00 0
+11409000-11457000 rwxp 00000000 00:00 0
+11457000-1145a000 ---p 00000000 00:00 0
+1145a000-114a8000 rwxp 00000000 00:00 0
+114a8000-114ab000 ---p 00000000 00:00 0
+114ab000-114f9000 rwxp 00000000 00:00 0
+114f9000-11600000 rwxs 00000000 00:04 29884432 /SYSV42341490 (deleted)
+11600000-11700000 rwxp 00000000 00:00 0
+11700000-11702000 r-xs 00032000 08:04 826059 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/iri-0.8-sources.jar
+11702000-11707000 r-xs 00048000 08:04 826062 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/dom4j-1.6.1.jar
+11707000-11709000 r-xs 0000c000 08:04 825997 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/cos.jar
+11709000-1170d000 r-xs 0001b000 08:04 825967 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/concurrent.jar
+1170d000-11710000 ---p 00000000 00:00 0
+11710000-1175e000 rwxp 00000000 00:00 0
+1175e000-11761000 ---p 00000000 00:00 0
+11761000-117af000 rwxp 00000000 00:00 0
+117af000-117b2000 ---p 00000000 00:00 0
+117b2000-11800000 rwxp 00000000 00:00 0
+11800000-118f5000 rwxp 00000000 00:00 0
+118f5000-11900000 ---p 00000000 00:00 0
+11900000-11901000 rwxp 00000000 00:00 0
+11901000-11903000 r-xs 0000d000 08:04 825951 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-logging-1.1.1.jar
+11903000-11908000 r-xs 00041000 08:04 825925 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-lang-2.6.jar
+11908000-1190b000 r-xs 00024000 08:04 825940 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-io-2.0.1.jar
+1190b000-11911000 r-xs 00045000 08:04 825958 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-httpclient-3.1.jar
+11911000-11914000 r-xs 0000c000 08:04 825929 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-fileupload-1.2.1.jar
+11914000-11917000 r-xs 0000f000 08:04 826006 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-discovery-0.2.jar
+11917000-1191b000 r-xs 0001f000 08:04 825943 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-digester-1.7.jar
+1191b000-1191e000 ---p 00000000 00:00 0
+1191e000-1196d000 rwxp 00000000 00:00 0
+1196d000-119af000 rwxp 00000000 00:00 0
+119af000-119b2000 ---p 00000000 00:00 0
+119b2000-11a00000 rwxp 00000000 00:00 0
+11a00000-11b00000 rwxp 00000000 00:00 0
+11b00000-11b3c000 rwxp 00000000 00:00 0
+11b3c000-11b3e000 r-xs 0000e000 08:04 825942 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-pool-1.3.jar
+11b3e000-11b41000 r-xs 00025000 08:04 825931 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-dbcp-1.4.jar
+11b41000-11b4f000 r-xs 0007f000 08:04 826074 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-collections-3.2.1.jar
+11b4f000-11b51000 r-xs 0000a000 08:04 825977 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-codec-1.3.jar
+11b51000-11b52000 r-xs 00008000 08:04 825926 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-cli-1.1.jar
+11b52000-11b57000 r-xs 00032000 08:04 826008 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-betwixt-0.7.jar
+11b57000-11b5b000 r-xs 00026000 08:04 825927 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-beanutils-core.jar
+11b5b000-11b5f000 r-xs 0001e000 08:04 825923 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aterm-java-1.6.jar
+11b5f000-11b64000 r-xs 0003c000 08:04 825941 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/arq-2.8.5-tests.jar
+11b64000-11b69000 r-xs 00068000 08:04 826075 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/antlr-2.7.7.jar
+11b69000-11b6b000 r-xs 00005000 08:04 826022 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-xml-2.2.jar
+11b6b000-11b6d000 r-xs 00003000 08:04 826037 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-webapp-core-2.3.jar
+11b6d000-11b6f000 r-xs 00002000 08:04 826046 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-text-2.2.jar
+11b6f000-11b71000 r-xs 00003000 08:04 825965 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-platform-info-2.4.jar
+11b71000-11b73000 r-xs 00002000 08:04 825963 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-net-2.2.jar
+11b73000-11b74000 r-xs 00002000 08:04 825928 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-lang-2.2.jar
+11b74000-11b75000 r-xs 00005000 08:04 826021 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-iteration-2.3.jar
+11b75000-11b76000 r-xs 00005000 08:04 825975 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-io-2.4.jar
+11b76000-11b77000 r-xs 00006000 08:04 826042 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-i18n-1.0.jar
+11b77000-11b78000 r-xs 00003000 08:04 825988 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-concurrent-2.2.jar
+11b78000-11b7a000 r-xs 00006000 08:04 826029 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-collections-2.3.jar
+11b7a000-11b7d000 ---p 00000000 00:00 0
+11b7d000-11bcb000 rwxp 00000000 00:00 0
+11bcb000-11bcd000 r-xp 00000000 08:04 60701 /lib/libnss_mdns4.so.2
+11bcd000-11bce000 r-xp 00001000 08:04 60701 /lib/libnss_mdns4.so.2
+11bce000-11bcf000 rwxp 00002000 08:04 60701 /lib/libnss_mdns4.so.2
+11bcf000-11bdf000 r-xp 00000000 08:04 9220 /lib/tls/i686/cmov/libresolv-2.11.1.so
+11bdf000-11be0000 r-xp 00010000 08:04 9220 /lib/tls/i686/cmov/libresolv-2.11.1.so
+11be0000-11be1000 rwxp 00011000 08:04 9220 /lib/tls/i686/cmov/libresolv-2.11.1.so
+11be1000-11be3000 rwxp 00000000 00:00 0
+11be3000-11be7000 r-xp 00000000 08:04 9213 /lib/tls/i686/cmov/libnss_dns-2.11.1.so
+11be7000-11be8000 r-xp 00004000 08:04 9213 /lib/tls/i686/cmov/libnss_dns-2.11.1.so
+11be8000-11be9000 rwxp 00005000 08:04 9213 /lib/tls/i686/cmov/libnss_dns-2.11.1.so
+11be9000-11beb000 r-xp 00000000 08:04 60702 /lib/libnss_mdns4_minimal.so.2
+11beb000-11bec000 r-xp 00001000 08:04 60702 /lib/libnss_mdns4_minimal.so.2
+11bec000-11bed000 rwxp 00002000 08:04 60702 /lib/libnss_mdns4_minimal.so.2
+11bed000-11bee000 r-xs 000c1000 08:04 825642 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/oim.vivo.scimapcore.jar
+11bee000-11bf0000 r-xs 00004000 08:04 825922 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-webapp-base-core-3.4.jar
+11bf0000-11bf1000 r-xs 00001000 08:04 825982 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-logging-file-3.4.jar
+11bf1000-11bf2000 r-xs 00001000 08:04 826012 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-logging-api-3.4.jar
+11bf2000-11bf4000 r-xs 00004000 08:04 825992 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-core-3.4.jar
+11bf4000-11bf6000 r-xs 0000e000 08:04 826048 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/activation-1.1.jar
+11bf6000-11bfa000 r-xs 00018000 08:04 826066 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/XmlSchema-1.0.3.jar
+11bfa000-11c00000 r-xs 00091000 08:09 5250038 /home/opt/jdk1.6.0_11/jre/lib/jsse.jar
+11c00000-11cf8000 rwxp 00000000 00:00 0
+11cf8000-11d00000 ---p 00000000 00:00 0
+11d00000-11dff000 rwxp 00000000 00:00 0
+11dff000-11e00000 ---p 00000000 00:00 0
+11e00000-11efb000 rwxp 00000000 00:00 0
+11efb000-11f00000 ---p 00000000 00:00 0
+11f00000-11f1e000 rwxp 00000000 00:00 0
+11f1e000-11f25000 r-xs 00110000 08:09 5250291 /home/opt/jdk1.6.0_11/jre/lib/resources.jar
+11f25000-11f26000 r-xs 0000c000 08:04 825964 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/json-taglib-0.4.1.jar
+11f26000-11fa0000 rwxp 00000000 00:00 0
+11fa0000-11fa7000 r-xp 00000000 08:09 5250233 /home/opt/jdk1.6.0_11/jre/lib/i386/libnio.so
+11fa7000-11fa8000 rwxp 00006000 08:09 5250233 /home/opt/jdk1.6.0_11/jre/lib/i386/libnio.so
+11fa8000-11fae000 r-xp 00000000 08:09 5250192 /home/opt/jdk1.6.0_11/jre/lib/i386/libmanagement.so
+11fae000-11faf000 rwxp 00005000 08:09 5250192 /home/opt/jdk1.6.0_11/jre/lib/i386/libmanagement.so
+11faf000-11fb2000 ---p 00000000 00:00 0
+11fb2000-12000000 rwxp 00000000 00:00 0
+12000000-120fd000 rwxp 00000000 00:00 0
+120fd000-12100000 ---p 00000000 00:00 0
+12100000-121ff000 rwxp 00000000 00:00 0
+121ff000-12200000 ---p 00000000 00:00 0
+12200000-122fb000 rwxp 00000000 00:00 0
+122fb000-12300000 ---p 00000000 00:00 0
+12300000-12301000 r-xs 00002000 08:04 826044 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/csv-1.0.jar
+12301000-12325000 rwxp 00000000 00:00 0
+12325000-12338000 r-xp 00000000 08:09 5250193 /home/opt/jdk1.6.0_11/jre/lib/i386/libnet.so
+12338000-12339000 rwxp 00013000 08:09 5250193 /home/opt/jdk1.6.0_11/jre/lib/i386/libnet.so
+12339000-1233a000 ---p 00000000 00:00 0
+1233a000-123ba000 rwxp 00000000 00:00 0
+123ba000-123bd000 ---p 00000000 00:00 0
+123bd000-1240b000 rwxp 00000000 00:00 0
+1240b000-1240e000 ---p 00000000 00:00 0
+1240e000-1248c000 rwxp 00000000 00:00 0
+1248c000-1248f000 ---p 00000000 00:00 0
+1248f000-1250d000 rwxp 00000000 00:00 0
+1250d000-12510000 ---p 00000000 00:00 0
+12510000-1255e000 rwxp 00000000 00:00 0
+1255e000-12561000 ---p 00000000 00:00 0
+12561000-125af000 rwxp 00000000 00:00 0
+125af000-125b2000 ---p 00000000 00:00 0
+125b2000-12600000 rwxp 00000000 00:00 0
+12600000-12700000 rwxp 00000000 00:00 0
+12700000-12701000 rwxp 00000000 00:00 0
+12701000-12702000 rwxs 00000000 00:04 29917203 /SYSV42341491 (deleted)
+12702000-12704000 rwxp 00000000 00:00 0
+12704000-12707000 r-xs 000cb000 08:09 5250319 /home/opt/jdk1.6.0_11/jre/lib/ext/localedata.jar
+12707000-1270f000 r-xs 00076000 08:04 525983 /usr/local/apache-tomcat-6.0.10/lib/jasper.jar
+1270f000-12710000 r-xs 00006000 08:04 525990 /usr/local/apache-tomcat-6.0.10/lib/el-api.jar
+12710000-12712000 r-xs 00017000 08:04 525998 /usr/local/apache-tomcat-6.0.10/lib/jasper-el.jar
+12712000-12715000 r-xs 0001a000 08:04 525987 /usr/local/apache-tomcat-6.0.10/lib/catalina-ha.jar
+12715000-1271f000 r-xs 000a2000 08:04 525984 /usr/local/apache-tomcat-6.0.10/lib/tomcat-coyote.jar
+1271f000-12722000 ---p 00000000 00:00 0
+12722000-12770000 rwxp 00000000 00:00 0
+12770000-127af000 r-xp 00000000 08:04 795504 /usr/lib/locale/en_US.utf8/LC_CTYPE
+127af000-127b2000 ---p 00000000 00:00 0
+127b2000-12800000 rwxp 00000000 00:00 0
+12800000-128f9000 rwxp 00000000 00:00 0
+128f9000-12900000 ---p 00000000 00:00 0
+12900000-12903000 r-xs 00006000 08:04 525994 /usr/local/apache-tomcat-6.0.10/lib/tomcat-i18n-fr.jar
+12903000-12910000 r-xs 000f4000 08:04 525989 /usr/local/apache-tomcat-6.0.10/lib/catalina.jar
+12910000-12912000 r-xs 00014000 08:04 525991 /usr/local/apache-tomcat-6.0.10/lib/servlet-api.jar
+12912000-12914000 r-xs 00007000 08:04 525995 /usr/local/apache-tomcat-6.0.10/lib/tomcat-i18n-es.jar
+12914000-12916000 r-xs 00012000 08:04 525988 /usr/local/apache-tomcat-6.0.10/lib/jsp-api.jar
+12916000-12918000 r-xs 0000a000 08:04 525985 /usr/local/apache-tomcat-6.0.10/lib/catalina-ant.jar
+12918000-1291d000 r-xs 00030000 08:04 525993 /usr/local/apache-tomcat-6.0.10/lib/catalina-tribes.jar
+1291d000-12929000 r-xs 0013b000 08:04 525997 /usr/local/apache-tomcat-6.0.10/lib/jasper-jdt.jar
+12929000-1292c000 ---p 00000000 00:00 0
+1292c000-1297a000 rwxp 00000000 00:00 0
+1297a000-1297f000 r-xs 00050000 08:06 69 /tmp/yjp201007231244.jar
+1297f000-12980000 ---p 00000000 00:00 0
+12980000-12a33000 rwxp 00000000 00:00 0
+12a33000-12bc3000 r-xs 02ef0000 08:09 5250275 /home/opt/jdk1.6.0_11/jre/lib/rt.jar
+12bc3000-12bc4000 ---p 00000000 00:00 0
+12bc4000-12c44000 rwxp 00000000 00:00 0
+12c44000-12c45000 ---p 00000000 00:00 0
+12c45000-12cd9000 rwxp 00000000 00:00 0
+12cd9000-12ce5000 rwxp 00000000 00:00 0
+12ce5000-12f3b000 rwxp 00000000 00:00 0
+12f3b000-1313d000 rwxp 00000000 00:00 0
+1313d000-13151000 rwxp 00000000 00:00 0
+13151000-1315d000 rwxp 00000000 00:00 0
+1315d000-133b3000 rwxp 00000000 00:00 0
+133b3000-135b4000 rwxp 00000000 00:00 0
+135b4000-1363f000 rwxp 00000000 00:00 0
+1363f000-15de0000 rwxp 00000000 00:00 0
+15de0000-17640000 rwxp 00000000 00:00 0
+17640000-62080000 rwxp 00000000 00:00 0
+62080000-a2480000 rwxp 00000000 00:00 0
+a2480000-b3a41000 rwxp 00000000 00:00 0
+b3a41000-b3a43000 r-xs 00008000 08:04 525986 /usr/local/apache-tomcat-6.0.10/lib/tomcat-i18n-ja.jar
+b3a43000-b3a5e000 rwxp 00000000 00:00 0
+b3a5e000-b3b03000 rwxp 00000000 00:00 0
+b3b03000-b41b3000 rwxp 00000000 00:00 0
+b41b3000-b6b03000 rwxp 00000000 00:00 0
+b6b03000-b6b12000 r-xp 00000000 08:09 5250210 /home/opt/jdk1.6.0_11/jre/lib/i386/libzip.so
+b6b12000-b6b14000 rwxp 0000e000 08:09 5250210 /home/opt/jdk1.6.0_11/jre/lib/i386/libzip.so
+b6b14000-b6b37000 r-xp 00000000 08:09 5250212 /home/opt/jdk1.6.0_11/jre/lib/i386/libjava.so
+b6b37000-b6b39000 rwxp 00023000 08:09 5250212 /home/opt/jdk1.6.0_11/jre/lib/i386/libjava.so
+b6b39000-b6b44000 r-xp 00000000 08:09 5250245 /home/opt/jdk1.6.0_11/jre/lib/i386/libverify.so
+b6b44000-b6b45000 rwxp 0000b000 08:09 5250245 /home/opt/jdk1.6.0_11/jre/lib/i386/libverify.so
+b6b45000-b6b46000 ---p 00000000 00:00 0
+b6b46000-b7346000 rwxp 00000000 00:00 0
+b7346000-b734c000 r-xp 00000000 08:04 7436 /lib/tls/i686/cmov/libnss_compat-2.11.1.so
+b734c000-b734d000 r-xp 00006000 08:04 7436 /lib/tls/i686/cmov/libnss_compat-2.11.1.so
+b734d000-b734e000 rwxp 00007000 08:04 7436 /lib/tls/i686/cmov/libnss_compat-2.11.1.so
+b734e000-b734f000 r-xs 00002000 08:04 525996 /usr/local/apache-tomcat-6.0.10/lib/annotations-api.jar
+b734f000-b7352000 r-xs 00025000 08:04 525992 /usr/local/apache-tomcat-6.0.10/lib/tomcat-dbcp.jar
+b7352000-b7359000 r-xs 00000000 08:04 101751 /usr/lib/gconv/gconv-modules.cache
+b7359000-b7361000 rwxs 00000000 08:06 29 /tmp/hsperfdata_bdc34/16825
+b7361000-b738a000 rwxp 00000000 00:00 0
+b738a000-b74d5000 r-xp 00000000 08:09 2098489 /home/opt/yourkit-9.0.7/bin/linux-x86-32/libyjpagent.so
+b74d5000-b74ef000 rwxp 0014a000 08:09 2098489 /home/opt/yourkit-9.0.7/bin/linux-x86-32/libyjpagent.so
+b74ef000-b7501000 rwxp 00000000 00:00 0
+b7501000-b7514000 r-xp 00000000 08:04 7422 /lib/tls/i686/cmov/libnsl-2.11.1.so
+b7514000-b7515000 r-xp 00012000 08:04 7422 /lib/tls/i686/cmov/libnsl-2.11.1.so
+b7515000-b7516000 rwxp 00013000 08:04 7422 /lib/tls/i686/cmov/libnsl-2.11.1.so
+b7516000-b7518000 rwxp 00000000 00:00 0
+b7518000-b751a000 r-xs 00003000 08:04 525952 /usr/local/apache-tomcat-6.0.10/bin/tomcat-juli.jar
+b751a000-b751c000 r-xs 00001000 08:04 525962 /usr/local/apache-tomcat-6.0.10/bin/commons-daemon.jar
+b751c000-b751e000 r-xs 00003000 08:04 525959 /usr/local/apache-tomcat-6.0.10/bin/bootstrap.jar
+b751e000-b751f000 rwxp 00000000 00:00 0
+b751f000-b7529000 r-xp 00000000 08:04 9214 /lib/tls/i686/cmov/libnss_files-2.11.1.so
+b7529000-b752a000 r-xp 00009000 08:04 9214 /lib/tls/i686/cmov/libnss_files-2.11.1.so
+b752a000-b752b000 rwxp 0000a000 08:04 9214 /lib/tls/i686/cmov/libnss_files-2.11.1.so
+b752b000-b7532000 r-xp 00000000 08:04 9221 /lib/tls/i686/cmov/librt-2.11.1.so
+b7532000-b7533000 r-xp 00006000 08:04 9221 /lib/tls/i686/cmov/librt-2.11.1.so
+b7533000-b7534000 rwxp 00007000 08:04 9221 /lib/tls/i686/cmov/librt-2.11.1.so
+b7534000-b7537000 ---p 00000000 00:00 0
+b7537000-b7585000 rwxp 00000000 00:00 0
+b7585000-b75a9000 r-xp 00000000 08:04 6725 /lib/tls/i686/cmov/libm-2.11.1.so
+b75a9000-b75aa000 r-xp 00023000 08:04 6725 /lib/tls/i686/cmov/libm-2.11.1.so
+b75aa000-b75ab000 rwxp 00024000 08:04 6725 /lib/tls/i686/cmov/libm-2.11.1.so
+b75ab000-b75ac000 rwxp 00000000 00:00 0
+b75ac000-b76ff000 r-xp 00000000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b76ff000-b7700000 ---p 00153000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7700000-b7702000 r-xp 00153000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7702000-b7703000 rwxp 00155000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7703000-b7706000 rwxp 00000000 00:00 0
+b7706000-b7708000 r-xp 00000000 08:04 5520 /lib/tls/i686/cmov/libdl-2.11.1.so
+b7708000-b7709000 r-xp 00001000 08:04 5520 /lib/tls/i686/cmov/libdl-2.11.1.so
+b7709000-b770a000 rwxp 00002000 08:04 5520 /lib/tls/i686/cmov/libdl-2.11.1.so
+b770a000-b7711000 r-xp 00000000 08:09 5250240 /home/opt/jdk1.6.0_11/jre/lib/i386/jli/libjli.so
+b7711000-b7713000 rwxp 00006000 08:09 5250240 /home/opt/jdk1.6.0_11/jre/lib/i386/jli/libjli.so
+b7713000-b7714000 rwxp 00000000 00:00 0
+b7714000-b7729000 r-xp 00000000 08:04 9219 /lib/tls/i686/cmov/libpthread-2.11.1.so
+b7729000-b772a000 r-xp 00014000 08:04 9219 /lib/tls/i686/cmov/libpthread-2.11.1.so
+b772a000-b772b000 rwxp 00015000 08:04 9219 /lib/tls/i686/cmov/libpthread-2.11.1.so
+b772b000-b772d000 rwxp 00000000 00:00 0
+b772d000-b7735000 r-xp 00000000 08:04 9216 /lib/tls/i686/cmov/libnss_nis-2.11.1.so
+b7735000-b7736000 r-xp 00007000 08:04 9216 /lib/tls/i686/cmov/libnss_nis-2.11.1.so
+b7736000-b7737000 rwxp 00008000 08:04 9216 /lib/tls/i686/cmov/libnss_nis-2.11.1.so
+b7737000-b773d000 r-xp 00000000 08:09 5250222 /home/opt/jdk1.6.0_11/jre/lib/i386/native_threads/libhpi.so
+b773d000-b773e000 rwxp 00006000 08:09 5250222 /home/opt/jdk1.6.0_11/jre/lib/i386/native_threads/libhpi.so
+b773e000-b773f000 rwxp 00000000 00:00 0
+b773f000-b7740000 ---p 00000000 00:00 0
+b7740000-b7742000 rwxp 00000000 00:00 0
+b7742000-b7743000 r-xp 00000000 00:00 0 [vdso]
+b7743000-b775e000 r-xp 00000000 08:04 2817 /lib/ld-2.11.1.so
+b775e000-b775f000 r-xp 0001a000 08:04 2817 /lib/ld-2.11.1.so
+b775f000-b7760000 rwxp 0001b000 08:04 2817 /lib/ld-2.11.1.so
+b7760000-b9360000 rwxp 00000000 00:00 0
+b9400000-bfc00000 rwxp 00000000 00:00 0
+bfc0c000-bfc21000 rwxp 00000000 00:00 0 [stack]
+bfd00000-c0000000 rwxp 00000000 00:00 0
+
+VM Arguments:
+jvm_args: -agentpath:/home/opt/yourkit-9.0.7/bin/linux-x86-32/libyjpagent.so=disablestacktelemetry,disableexceptiontelemetry,builtinprobes=none,delay=10000,sessionname=Tomcat -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=/usr/local/tomcat/conf/logging.properties -Xmx2500m -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=/usr/local/tomcat/endorsed -Dcatalina.base=/usr/local/tomcat -Dcatalina.home=/usr/local/tomcat -Djava.io.tmpdir=/usr/local/tomcat/temp
+java_command: org.apache.catalina.startup.Bootstrap start
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=/home/opt/jdk1.6.0_11
+PATH=/sbin:/usr/sbin:/home/bdc34/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/opt/scala/bin
+USERNAME=bdc34
+LD_LIBRARY_PATH=/home/opt/jdk1.6.0_11/jre/lib/i386/server:/home/opt/jdk1.6.0_11/jre/lib/i386:/home/opt/jdk1.6.0_11/jre/../lib/i386
+SHELL=/bin/bash
+DISPLAY=:0.0
+
+Signal Handlers:
+SIGSEGV: [libjvm.so+0x606fd0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGBUS: [libjvm.so+0x606fd0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGFPE: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGPIPE: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGXFSZ: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGILL: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
+SIGUSR2: [libjvm.so+0x506b60], sa_mask[0]=0x00000000, sa_flags=0x10000004
+SIGHUP: [libjvm.so+0x506900], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGINT: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000
+SIGTERM: [libjvm.so+0x506900], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGQUIT: [libjvm.so+0x506900], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+
+
+--------------- S Y S T E M ---------------
+
+OS:squeeze/sid
+
+uname:Linux 2.6.32-31-generic #61-Ubuntu SMP Fri Apr 8 18:24:35 UTC 2011 i686
+libc:glibc 2.11.1 NPTL 2.11.1
+rlimit: STACK 8192k, CORE 0k, NPROC infinity, NOFILE 1024, AS infinity
+load average:1.35 1.26 1.04
+
+CPU:total 2 (2 cores per cpu, 1 threads per core) family 6 model 7 stepping 10, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3
+
+Memory: 4k page, physical 3602612k(383144k free), swap 4393704k(4036356k free)
+
+vm_info: Java HotSpot(TM) Server VM (11.0-b16) for linux-x86 JRE (1.6.0_11-b03), built on Nov 10 2008 01:21:35 by "java_re" with gcc 3.2.1-7a (J2SE release)
+
+time: Fri Jun 24 16:10:19 2011
+elapsed time: 166 seconds
+
diff --git a/solr/solrjClientLibs/hs_err_pid17097.log b/solr/solrjClientLibs/hs_err_pid17097.log
new file mode 100644
index 000000000..39a322b2d
--- /dev/null
+++ b/solr/solrjClientLibs/hs_err_pid17097.log
@@ -0,0 +1,801 @@
+#
+# An unexpected error has been detected by Java Runtime Environment:
+#
+# java.lang.OutOfMemoryError: requested 152 bytes for CHeapObj-new. Out of swap space?
+#
+# Internal Error (allocation.inline.hpp:42), pid=17097, tid=586402672
+# Error: CHeapObj-new
+#
+# Java VM: Java HotSpot(TM) Server VM (11.0-b16 mixed mode linux-x86)
+# If you would like to submit a bug report, please visit:
+# http://java.sun.com/webapps/bugreport/crash.jsp
+#
+
+--------------- T H R E A D ---------------
+
+Current thread (0x091ed400): VMThread [stack: 0x22ebc000,0x22f3d000] [id=17102]
+
+Stack: [0x22ebc000,0x22f3d000], sp=0x22f3bd90, free space=511k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V [libjvm.so+0x6064fb]
+V [libjvm.so+0x2d37f1]
+V [libjvm.so+0x19ad85]
+V [libjvm.so+0x3c613d]
+V [libjvm.so+0x3c64bd]
+V [libjvm.so+0x3c5c1a]
+V [libjvm.so+0x477af7]
+V [libjvm.so+0x475b39]
+V [libjvm.so+0x4ecceb]
+V [libjvm.so+0x5158b7]
+V [libjvm.so+0x477baf]
+V [libjvm.so+0x6146e7]
+V [libjvm.so+0x613cfc]
+V [libjvm.so+0x613ed1]
+V [libjvm.so+0x613aaf]
+V [libjvm.so+0x506709]
+C [libpthread.so.0+0x596e]
+
+VM_Operation (0x21df65d0): HeapIterateOperation, mode: safepoint, requested by thread 0x093adc00
+
+
+--------------- P R O C E S S ---------------
+
+Java Threads: ( => current thread )
+ 0x0b183c00 JavaThread "http-8080-5" daemon [_thread_blocked, id=17154, stack(0x200bd000,0x2010e000)]
+ 0x0b183800 JavaThread "http-8080-4" daemon [_thread_blocked, id=17153, stack(0x2010e000,0x2015f000)]
+ 0x0aa19800 JavaThread "http-8080-3" daemon [_thread_blocked, id=17152, stack(0x2015f000,0x201b0000)]
+ 0x0aa19000 JavaThread "http-8080-2" daemon [_thread_blocked, id=17151, stack(0x201b0000,0x20201000)]
+ 0x0a284800 JavaThread "TP-Monitor" daemon [_thread_blocked, id=17144, stack(0x212af000,0x21300000)]
+ 0x0a0e2400 JavaThread "TP-Processor4" daemon [_thread_in_native, id=17143, stack(0x21a0d000,0x21a5e000)]
+ 0x0a02dc00 JavaThread "TP-Processor3" daemon [_thread_blocked, id=17142, stack(0x21a5e000,0x21aaf000)]
+ 0x0a1d2400 JavaThread "TP-Processor2" daemon [_thread_blocked, id=17141, stack(0x21aaf000,0x21b00000)]
+ 0x0a265000 JavaThread "TP-Processor1" daemon [_thread_blocked, id=17140, stack(0x21c12000,0x21c63000)]
+ 0x0a7fd000 JavaThread "http-8080-1" daemon [_thread_blocked, id=17139, stack(0x21c63000,0x21cb4000)]
+ 0x213f0400 JavaThread "http-8080-Acceptor-0" daemon [_thread_in_native, id=17138, stack(0x21cb4000,0x21d05000)]
+ 0x22607c00 JavaThread "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon [_thread_blocked, id=17137, stack(0x21d05000,0x21d56000)]
+ 0x22119800 JavaThread "VClassGroupCache.RebuildGroupCacheThread" daemon [_thread_blocked, id=17131, stack(0x20213000,0x20264000)]
+ 0x20cb8000 JavaThread "IndexBuilder" [_thread_blocked, id=17130, stack(0x20264000,0x202b5000)]
+ 0x09e62800 JavaThread "Timer-0" daemon [_thread_blocked, id=17124, stack(0x21041000,0x21092000)]
+ 0x0a2c8400 JavaThread "pool-3-thread-1" [_thread_blocked, id=17123, stack(0x21d56000,0x21da7000)]
+ 0x2212e000 JavaThread "pool-1-thread-1" [_thread_blocked, id=17117, stack(0x22d34000,0x22d85000)]
+ 0x093adc00 JavaThread "YJPAgent-RequestListener" daemon [_thread_blocked, id=17115, stack(0x21da7000,0x21df8000)]
+ 0x09527800 JavaThread "YJPAgent-Telemetry" daemon [_thread_blocked, id=17114, stack(0x2291a000,0x2296b000)]
+ 0x22c08c00 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=17111, stack(0x22a0b000,0x22a5c000)]
+ 0x231ccc00 JavaThread "CompilerThread1" daemon [_thread_blocked, id=17110, stack(0x22a5c000,0x22add000)]
+ 0x231df400 JavaThread "CompilerThread0" daemon [_thread_blocked, id=17109, stack(0x22add000,0x22b5e000)]
+ 0x231e0400 JavaThread "YJPAgent-OOMESnapshotDetector" daemon [_thread_in_native, id=17108, stack(0x22b5e000,0x22baf000)]
+ 0x231de800 JavaThread "YJPAgent-CPUSampler" daemon [_thread_blocked, id=17107, stack(0x22baf000,0x22c00000)]
+ 0x231e2000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=17105, stack(0x22d85000,0x22dd6000)]
+ 0x23100c00 JavaThread "Finalizer" daemon [_thread_blocked, id=17104, stack(0x22e15000,0x22e66000)]
+ 0x092a5c00 JavaThread "Reference Handler" daemon [_thread_blocked, id=17103, stack(0x22e66000,0x22eb7000)]
+ 0x09199800 JavaThread "main" [_thread_in_native, id=17098, stack(0xb76a6000,0xb76f7000)]
+
+Other Threads:
+=>0x091ed400 VMThread [stack: 0x22ebc000,0x22f3d000] [id=17102]
+ 0x22c0a400 WatcherThread [stack: 0x2298a000,0x22a0b000] [id=17112]
+
+VM state:at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
+[0x091977b8] UNKNOWN - owner thread: 0x091ed400
+[0x0919e418] UNKNOWN - owner thread: 0x091ed400
+[0x0919e6f0] UNKNOWN - owner thread: 0x091ed400
+[0x0919e828] UNKNOWN - owner thread: 0x093adc00
+
+Heap
+ PSYoungGen total 146496K, used 71585K [0xa5830000, 0xb3bb0000, 0xb3bb0000)
+ eden space 77696K, 11% used [0xa5830000,0xa610c8e0,0xaa410000)
+ from space 68800K, 90% used [0xaf880000,0xb358bc50,0xb3bb0000)
+ to space 77632K, 0% used [0xaa410000,0xaa410000,0xaefe0000)
+ PSOldGen total 1149568K, used 1084340K [0x33bb0000, 0x79e50000, 0xa5830000)
+ object space 1149568K, 94% used [0x33bb0000,0x75e9d058,0x79e50000)
+ PSPermGen total 41600K, used 34624K [0x23bb0000, 0x26450000, 0x33bb0000)
+ object space 41600K, 83% used [0x23bb0000,0x25d80160,0x26450000)
+
+Dynamic libraries:
+00010000-00100000 rwxp 00000000 00:00 0
+00100000-00200000 rwxp 00000000 00:00 0
+00200000-00400000 rwxp 00000000 00:00 0
+00400000-00600000 rwxp 00000000 00:00 0
+00600000-00800000 rwxp 00000000 00:00 0
+00800000-00a00000 rwxp 00000000 00:00 0
+00a00000-00c00000 rwxp 00000000 00:00 0
+00c00000-00e00000 rwxp 00000000 00:00 0
+00e00000-01000000 rwxp 00000000 00:00 0
+01000000-01200000 rwxp 00000000 00:00 0
+01200000-01400000 rwxp 00000000 00:00 0
+01400000-01600000 rwxp 00000000 00:00 0
+01600000-01800000 rwxp 00000000 00:00 0
+01800000-01a00000 rwxp 00000000 00:00 0
+01a00000-01c00000 rwxp 00000000 00:00 0
+01c00000-01e00000 rwxp 00000000 00:00 0
+01e00000-02000000 rwxp 00000000 00:00 0
+02000000-02200000 rwxp 00000000 00:00 0
+02200000-02400000 rwxp 00000000 00:00 0
+02400000-02600000 rwxp 00000000 00:00 0
+02600000-02800000 rwxp 00000000 00:00 0
+02800000-02a00000 rwxp 00000000 00:00 0
+02a00000-02c00000 rwxp 00000000 00:00 0
+02c00000-02e00000 rwxp 00000000 00:00 0
+02e00000-03000000 rwxp 00000000 00:00 0
+03000000-03200000 rwxp 00000000 00:00 0
+03200000-03400000 rwxp 00000000 00:00 0
+03400000-03600000 rwxp 00000000 00:00 0
+03600000-03800000 rwxp 00000000 00:00 0
+03800000-03a00000 rwxp 00000000 00:00 0
+03a00000-03c00000 rwxp 00000000 00:00 0
+03c00000-03e00000 rwxp 00000000 00:00 0
+03e00000-04000000 rwxp 00000000 00:00 0
+04000000-04200000 rwxp 00000000 00:00 0
+04200000-04400000 rwxp 00000000 00:00 0
+04400000-04600000 rwxp 00000000 00:00 0
+04600000-04800000 rwxp 00000000 00:00 0
+04800000-04a00000 rwxp 00000000 00:00 0
+04a00000-04c00000 rwxp 00000000 00:00 0
+04c00000-04e00000 rwxp 00000000 00:00 0
+04e00000-05000000 rwxp 00000000 00:00 0
+05000000-05200000 rwxp 00000000 00:00 0
+05200000-05400000 rwxp 00000000 00:00 0
+05400000-05600000 rwxp 00000000 00:00 0
+05600000-05800000 rwxp 00000000 00:00 0
+05800000-05a00000 rwxp 00000000 00:00 0
+05a00000-05c00000 rwxp 00000000 00:00 0
+05c00000-05e00000 rwxp 00000000 00:00 0
+05e00000-06000000 rwxp 00000000 00:00 0
+06000000-06676000 r-xp 00000000 08:09 5250207 /home/opt/jdk1.6.0_11/jre/lib/i386/server/libjvm.so
+06676000-066bb000 rwxp 00675000 08:09 5250207 /home/opt/jdk1.6.0_11/jre/lib/i386/server/libjvm.so
+066bb000-06ade000 rwxp 00000000 00:00 0
+06ade000-06b00000 rwxp 00000000 00:00 0
+06b00000-06c00000 rwxp 00000000 00:00 0
+06c00000-06d00000 rwxp 00000000 00:00 0
+06d00000-08048000 rwxp 00000000 00:00 0
+08048000-08052000 r-xp 00000000 08:09 5254499 /home/opt/jdk1.6.0_11/bin/java
+08052000-08053000 rwxp 00009000 08:09 5254499 /home/opt/jdk1.6.0_11/bin/java
+08053000-08100000 rwxp 00000000 00:00 0
+08100000-08200000 rwxp 00000000 00:00 0
+08200000-08400000 rwxp 00000000 00:00 0
+08400000-08600000 rwxp 00000000 00:00 0
+08600000-08800000 rwxp 00000000 00:00 0
+08800000-08a00000 rwxp 00000000 00:00 0
+08a00000-08c00000 rwxp 00000000 00:00 0
+08c00000-08e00000 rwxp 00000000 00:00 0
+08e00000-09000000 rwxp 00000000 00:00 0
+09000000-09100000 rwxp 00000000 00:00 0
+09100000-0b84f000 rwxp 00000000 00:00 0 [heap]
+0b84f000-0b900000 rwxp 00000000 00:00 0
+0b900000-0bb00000 rwxp 00000000 00:00 0
+0bb00000-0bd00000 rwxp 00000000 00:00 0
+0bd00000-0bf00000 rwxp 00000000 00:00 0
+0bf00000-0c100000 rwxp 00000000 00:00 0
+0c100000-0c300000 rwxp 00000000 00:00 0
+0c300000-0c500000 rwxp 00000000 00:00 0
+0c500000-0c700000 rwxp 00000000 00:00 0
+0c700000-0c900000 rwxp 00000000 00:00 0
+0c900000-0cb00000 rwxp 00000000 00:00 0
+0cb00000-0cd00000 rwxp 00000000 00:00 0
+0cd00000-0cf00000 rwxp 00000000 00:00 0
+0cf00000-0d100000 rwxp 00000000 00:00 0
+0d100000-0d300000 rwxp 00000000 00:00 0
+0d300000-0d500000 rwxp 00000000 00:00 0
+0d500000-0d700000 rwxp 00000000 00:00 0
+0d700000-0d900000 rwxp 00000000 00:00 0
+0d900000-0db00000 rwxp 00000000 00:00 0
+0db00000-0dd00000 rwxp 00000000 00:00 0
+0dd00000-0df00000 rwxp 00000000 00:00 0
+0df00000-0e100000 rwxp 00000000 00:00 0
+0e100000-0e300000 rwxp 00000000 00:00 0
+0e300000-0e500000 rwxp 00000000 00:00 0
+0e500000-0e700000 rwxp 00000000 00:00 0
+0e700000-0e900000 rwxp 00000000 00:00 0
+0e900000-0eb00000 rwxp 00000000 00:00 0
+0eb00000-0ed00000 rwxp 00000000 00:00 0
+0ed00000-0ef00000 rwxp 00000000 00:00 0
+0ef00000-0f100000 rwxp 00000000 00:00 0
+0f100000-0f300000 rwxp 00000000 00:00 0
+0f300000-0f500000 rwxp 00000000 00:00 0
+0f500000-0f700000 rwxp 00000000 00:00 0
+0f700000-0f900000 rwxp 00000000 00:00 0
+0f900000-0fb00000 rwxp 00000000 00:00 0
+0fb00000-0fd00000 rwxp 00000000 00:00 0
+0fd00000-0ff00000 rwxp 00000000 00:00 0
+0ff00000-10100000 rwxp 00000000 00:00 0
+10100000-10300000 rwxp 00000000 00:00 0
+10300000-10500000 rwxp 00000000 00:00 0
+10500000-10700000 rwxp 00000000 00:00 0
+10700000-10900000 rwxp 00000000 00:00 0
+10900000-10b00000 rwxp 00000000 00:00 0
+10b00000-10d00000 rwxp 00000000 00:00 0
+10d00000-10f00000 rwxp 00000000 00:00 0
+10f00000-11100000 rwxp 00000000 00:00 0
+11100000-11300000 rwxp 00000000 00:00 0
+11300000-11500000 rwxp 00000000 00:00 0
+11500000-11700000 rwxp 00000000 00:00 0
+11700000-11900000 rwxp 00000000 00:00 0
+11900000-11b00000 rwxp 00000000 00:00 0
+11b00000-11d00000 rwxp 00000000 00:00 0
+11d00000-11f00000 rwxp 00000000 00:00 0
+11f00000-12100000 rwxp 00000000 00:00 0
+12100000-12300000 rwxp 00000000 00:00 0
+12300000-12500000 rwxp 00000000 00:00 0
+12500000-12700000 rwxp 00000000 00:00 0
+12700000-12900000 rwxp 00000000 00:00 0
+12900000-12b00000 rwxp 00000000 00:00 0
+12b00000-12d00000 rwxp 00000000 00:00 0
+12d00000-12f00000 rwxp 00000000 00:00 0
+12f00000-13100000 rwxp 00000000 00:00 0
+13100000-13300000 rwxp 00000000 00:00 0
+13300000-13500000 rwxp 00000000 00:00 0
+13500000-13700000 rwxp 00000000 00:00 0
+13700000-13900000 rwxp 00000000 00:00 0
+13900000-13b00000 rwxp 00000000 00:00 0
+13b00000-13d00000 rwxp 00000000 00:00 0
+13d00000-13f00000 rwxp 00000000 00:00 0
+13f00000-14100000 rwxp 00000000 00:00 0
+14100000-14400000 rwxp 00000000 00:00 0
+14400000-14600000 rwxp 00000000 00:00 0
+14600000-14800000 rwxp 00000000 00:00 0
+14800000-14a00000 rwxp 00000000 00:00 0
+14a00000-14c00000 rwxp 00000000 00:00 0
+14c00000-14e00000 rwxp 00000000 00:00 0
+14e00000-15000000 rwxp 00000000 00:00 0
+15000000-15200000 rwxp 00000000 00:00 0
+15200000-15400000 rwxp 00000000 00:00 0
+15400000-15600000 rwxp 00000000 00:00 0
+15600000-15800000 rwxp 00000000 00:00 0
+15800000-15a00000 rwxp 00000000 00:00 0
+15a00000-15c00000 rwxp 00000000 00:00 0
+15c00000-15e00000 rwxp 00000000 00:00 0
+15e00000-16000000 rwxp 00000000 00:00 0
+16000000-16200000 rwxp 00000000 00:00 0
+16200000-16400000 rwxp 00000000 00:00 0
+16400000-16600000 rwxp 00000000 00:00 0
+16600000-16800000 rwxp 00000000 00:00 0
+16800000-16a00000 rwxp 00000000 00:00 0
+16a00000-16c00000 rwxp 00000000 00:00 0
+16c00000-16e00000 rwxp 00000000 00:00 0
+16e00000-17000000 rwxp 00000000 00:00 0
+17000000-17200000 rwxp 00000000 00:00 0
+17200000-17400000 rwxp 00000000 00:00 0
+17400000-17600000 rwxp 00000000 00:00 0
+17600000-17800000 rwxp 00000000 00:00 0
+17800000-17a00000 rwxp 00000000 00:00 0
+17a00000-17c00000 rwxp 00000000 00:00 0
+17c00000-17e00000 rwxp 00000000 00:00 0
+17e00000-18000000 rwxp 00000000 00:00 0
+18000000-18200000 rwxp 00000000 00:00 0
+18200000-18400000 rwxp 00000000 00:00 0
+18400000-18600000 rwxp 00000000 00:00 0
+18600000-18800000 rwxp 00000000 00:00 0
+18800000-18a00000 rwxp 00000000 00:00 0
+18a00000-18c00000 rwxp 00000000 00:00 0
+18c00000-18e00000 rwxp 00000000 00:00 0
+18e00000-19000000 rwxp 00000000 00:00 0
+19000000-19200000 rwxp 00000000 00:00 0
+19200000-19400000 rwxp 00000000 00:00 0
+19400000-19600000 rwxp 00000000 00:00 0
+19600000-19800000 rwxp 00000000 00:00 0
+19800000-19a00000 rwxp 00000000 00:00 0
+19a00000-19c00000 rwxp 00000000 00:00 0
+19c00000-19e00000 rwxp 00000000 00:00 0
+19e00000-1a000000 rwxp 00000000 00:00 0
+1a000000-1a200000 rwxp 00000000 00:00 0
+1a200000-1a400000 rwxp 00000000 00:00 0
+1a400000-1a600000 rwxp 00000000 00:00 0
+1a600000-1a800000 rwxp 00000000 00:00 0
+1a800000-1aa00000 rwxp 00000000 00:00 0
+1aa00000-1ac00000 rwxp 00000000 00:00 0
+1ac00000-1ae00000 rwxp 00000000 00:00 0
+1ae00000-1b000000 rwxp 00000000 00:00 0
+1b000000-1b200000 rwxp 00000000 00:00 0
+1b200000-1b400000 rwxp 00000000 00:00 0
+1b400000-1b600000 rwxp 00000000 00:00 0
+1b600000-1b800000 rwxp 00000000 00:00 0
+1b800000-1ba00000 rwxp 00000000 00:00 0
+1ba00000-1bc00000 rwxp 00000000 00:00 0
+1bc00000-1be00000 rwxp 00000000 00:00 0
+1be00000-1c000000 rwxp 00000000 00:00 0
+1c000000-1c200000 rwxp 00000000 00:00 0
+1c200000-1c400000 rwxp 00000000 00:00 0
+1c400000-1c600000 rwxp 00000000 00:00 0
+1c600000-1c800000 rwxp 00000000 00:00 0
+1c800000-1ca00000 rwxp 00000000 00:00 0
+1ca00000-1cc00000 rwxp 00000000 00:00 0
+1cc00000-1ce00000 rwxp 00000000 00:00 0
+1ce00000-1d000000 rwxp 00000000 00:00 0
+1d000000-1d200000 rwxp 00000000 00:00 0
+1d200000-1d400000 rwxp 00000000 00:00 0
+1d400000-1d600000 rwxp 00000000 00:00 0
+1d600000-1d800000 rwxp 00000000 00:00 0
+1d800000-1da00000 rwxp 00000000 00:00 0
+1da00000-1dc00000 rwxp 00000000 00:00 0
+1dc00000-1de00000 rwxp 00000000 00:00 0
+1de00000-1e000000 rwxp 00000000 00:00 0
+1e000000-1e200000 rwxp 00000000 00:00 0
+1e200000-1e300000 rwxp 00000000 00:00 0
+1e300000-1e600000 rwxp 00000000 00:00 0
+1e600000-1e800000 rwxp 00000000 00:00 0
+1e800000-1ea00000 rwxp 00000000 00:00 0
+1ea00000-1ec00000 rwxp 00000000 00:00 0
+1ec00000-1ee00000 rwxp 00000000 00:00 0
+1ee00000-1f000000 rwxp 00000000 00:00 0
+1f000000-1f200000 rwxp 00000000 00:00 0
+1f200000-1f400000 rwxp 00000000 00:00 0
+1f400000-1f600000 rwxp 00000000 00:00 0
+1f600000-1f800000 rwxp 00000000 00:00 0
+1f800000-1fa00000 rwxp 00000000 00:00 0
+1fa00000-1fc00000 rwxp 00000000 00:00 0
+1fc00000-1fe00000 rwxp 00000000 00:00 0
+1fe00000-20000000 rwxp 00000000 00:00 0
+20000000-200bd000 rwxp 00000000 00:00 0
+200bd000-200c0000 ---p 00000000 00:00 0
+200c0000-2010e000 rwxp 00000000 00:00 0
+2010e000-20111000 ---p 00000000 00:00 0
+20111000-2015f000 rwxp 00000000 00:00 0
+2015f000-20162000 ---p 00000000 00:00 0
+20162000-201b0000 rwxp 00000000 00:00 0
+201b0000-201b3000 ---p 00000000 00:00 0
+201b3000-20201000 rwxp 00000000 00:00 0
+20201000-2020b000 r-xs 00052000 08:04 825966 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xstream-1.2.2.jar
+2020b000-20213000 r-xs 00028000 08:04 826017 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xml-apis.jar
+20213000-20216000 ---p 00000000 00:00 0
+20216000-20264000 rwxp 00000000 00:00 0
+20264000-20267000 ---p 00000000 00:00 0
+20267000-202b5000 rwxp 00000000 00:00 0
+202b5000-202ba000 r-xs 00076000 08:04 825930 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xsdlib.jar
+202ba000-202d0000 r-xs 00110000 08:04 826047 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xercesImpl.jar
+202d0000-202d3000 r-xs 0001e000 08:04 826041 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xbean-spring-2.5.jar
+202d3000-2030f000 r-xs 00248000 08:04 826016 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xbean-2.1.0.jar
+2030f000-20330000 r-xs 00265000 08:04 825986 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xalan.jar
+20330000-20336000 r-xs 0006e000 08:04 825999 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/wstx-asl-3.0.0.jar
+20336000-2033a000 r-xs 0001c000 08:04 826026 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/wsdl4j-1.5.2.jar
+2033a000-20377000 r-xs 00294000 08:04 825961 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/spring2.5.6.jar
+20377000-20500000 rwxp 00000000 00:00 0
+20500000-20600000 rwxp 00000000 00:00 0
+20600000-20601000 rwxp 00000000 00:00 0
+20601000-20603000 r-xs 00005000 08:04 826024 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
+20603000-20606000 r-xs 0001f000 08:04 825950 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/trippi-1.3.2-core.jar
+20606000-2060f000 r-xs 00060000 08:04 826060 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/tdb-0.8.7.jar
+2060f000-20611000 r-xs 00003000 08:04 826064 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sparqltag.jar
+20611000-2063f000 r-xs 00276000 08:04 825473 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/solrjClient.jar
+2063f000-20640000 r-xs 00002000 08:04 825973 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/slf4j-log4j12-1.5.6.jar
+20640000-20642000 r-xs 00004000 08:04 825962 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/slf4j-api-1.5.6.jar
+20642000-20648000 r-xs 00040000 08:04 826055 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-rdbms-2.2.3.jar
+20648000-2064b000 r-xs 00016000 08:04 826003 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-nativerdf-2.2.3.jar
+2064b000-2064d000 r-xs 0000c000 08:04 826071 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-memory-2.2.3.jar
+2064d000-2064f000 r-xs 00004000 08:04 825991 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-inferencer-2.2.3.jar
+2064f000-20651000 r-xs 00007000 08:04 825985 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-sail-api-2.2.3.jar
+20651000-20652000 r-xs 00000000 08:04 825983 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-runtime-2.2.3.jar
+20652000-20654000 r-xs 00003000 08:04 826052 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-turtle-2.2.3.jar
+20654000-20655000 r-xs 00002000 08:04 826043 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-trix-2.2.3.jar
+20655000-20656000 r-xs 00001000 08:04 825994 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-trig-2.2.3.jar
+20656000-20658000 r-xs 00007000 08:04 826028 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-rdfxml-2.2.3.jar
+20658000-2065a000 r-xs 00002000 08:04 825949 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-ntriples-2.2.3.jar
+2065a000-2065c000 r-xs 00000000 08:04 826040 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-n3-2.2.3.jar
+2065c000-2065d000 r-xs 00004000 08:04 826018 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-rio-api-2.2.3.jar
+2065d000-2065f000 r-xs 00004000 08:04 825935 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-sail-2.2.3.jar
+2065f000-20660000 r-xs 00005000 08:04 825953 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-manager-2.2.3.jar
+20660000-20662000 r-xs 00003000 08:04 825946 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-http-2.2.3.jar
+20662000-20664000 r-xs 00003000 08:04 825996 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-event-2.2.3.jar
+20664000-20665000 r-xs 00002000 08:04 825937 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-dataset-2.2.3.jar
+20665000-20667000 r-xs 00002000 08:04 825978 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-contextaware-2.2.3.jar
+20667000-20669000 r-xs 00007000 08:04 826065 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-repository-api-2.2.3.jar
+20669000-2066a000 r-xs 00001000 08:04 826031 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-text-2.2.3.jar
+2066a000-2066c000 r-xs 00003000 08:04 825970 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-sparqlxml-2.2.3.jar
+2066c000-2066d000 r-xs 00001000 08:04 825993 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-sparqljson-2.2.3.jar
+2066d000-2066f000 r-xs 00002000 08:04 826050 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-binary-2.2.3.jar
+2066f000-20670000 r-xs 00003000 08:04 825933 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryresultio-api-2.2.3.jar
+20670000-20673000 r-xs 0001e000 08:04 826013 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryparser-sparql-2.2.3.jar
+20673000-20677000 r-xs 00020000 08:04 826025 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryparser-serql-2.2.3.jar
+20677000-20678000 r-xs 00001000 08:04 825984 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryparser-api-2.2.3.jar
+20678000-2067b000 r-xs 00013000 08:04 826063 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryalgebra-model-2.2.3.jar
+2067b000-2067f000 r-xs 00015000 08:04 825924 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-queryalgebra-evaluation-2.2.3.jar
+2067f000-20681000 r-xs 00008000 08:04 826053 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-query-2.2.3.jar
+20681000-20684000 r-xs 0000b000 08:04 825948 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-model-2.2.3.jar
+20684000-20686000 r-xs 00009000 08:04 825957 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-http-server-spring-2.2.3.jar
+20686000-20688000 r-xs 00004000 08:04 826023 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-http-protocol-2.2.3.jar
+20688000-20689000 r-xs 00003000 08:04 826068 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-http-client-2.2.3.jar
+20689000-2068a000 r-xs 00007000 08:04 826056 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sesame-console-2.2.3.jar
+2068a000-20696000 r-xs 00071000 08:04 826051 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sdb-1.3.2.jar
+20696000-2069b000 r-xs 00015000 08:04 825969 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/sdb-1.3.2-tests.jar
+2069b000-206b7000 r-xs 0051b000 08:04 825952 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/saxon9he.jar
+206b7000-206b8000 r-xs 00004000 08:04 825995 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/saaj.jar
+206b8000-206ba000 r-xs 00004000 08:04 825968 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/rsslib4j-0.2.jar
+206ba000-206bd000 r-xs 00018000 08:04 826030 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/rowset-20040728-v101.jar
+206bd000-206be000 r-xs 00004000 08:04 826049 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/relaxngDatatype.jar
+206be000-206c5000 r-xs 00077000 08:04 825944 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-test.jar
+206c5000-206cb000 r-xs 0002d000 08:04 826005 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-rules.jar
+206cb000-206d2000 r-xs 0005c000 08:04 825932 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-query.jar
+206d2000-206d4000 r-xs 00010000 08:04 826007 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-pellint.jar
+206d4000-206d6000 r-xs 00018000 08:04 826009 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-owlapiv3.jar
+206d6000-206d8000 r-xs 00010000 08:04 826020 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-owlapi.jar
+206d8000-206d9000 r-xs 0000d000 08:04 826067 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-modularity.jar
+206d9000-206de000 r-xs 00029000 08:04 825934 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-jena.jar
+206de000-206e0000 r-xs 00006000 08:04 826034 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-explanation.jar
+206e0000-206e1000 r-xs 0000c000 08:04 825979 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-el.jar
+206e1000-206e2000 r-xs 00006000 08:04 825990 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-dig.jar
+206e2000-206e7000 r-xs 0003c000 08:04 826000 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-datatypes.jar
+206e7000-206f0000 r-xs 00090000 08:04 826027 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-core.jar
+206f0000-206f2000 r-xs 00011000 08:04 825939 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/pellet-cli.jar
+206f2000-20700000 r-xs 00190000 08:04 825987 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/ojdbc14_g.jar
+20700000-207f3000 rwxp 00000000 00:00 0
+207f3000-20800000 ---p 00000000 00:00 0
+20800000-208f4000 rwxp 00000000 00:00 0
+208f4000-20900000 ---p 00000000 00:00 0
+20900000-209f7000 rwxp 00000000 00:00 0
+209f7000-20a00000 ---p 00000000 00:00 0
+20a00000-20ae4000 rwxp 00000000 00:00 0
+20ae4000-20b00000 ---p 00000000 00:00 0
+20b00000-20bfa000 rwxp 00000000 00:00 0
+20bfa000-20c00000 ---p 00000000 00:00 0
+20c00000-20cfe000 rwxp 00000000 00:00 0
+20cfe000-20d00000 ---p 00000000 00:00 0
+20d00000-20dea000 rwxp 00000000 00:00 0
+20dea000-20e00000 ---p 00000000 00:00 0
+20e00000-20ee2000 rwxp 00000000 00:00 0
+20ee2000-20f00000 ---p 00000000 00:00 0
+20f00000-20fe9000 rwxp 00000000 00:00 0
+20fe9000-21000000 ---p 00000000 00:00 0
+21000000-21002000 r-xs 0000a000 08:04 826032 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/taglibs-string.jar
+21002000-21004000 r-xs 00038000 08:04 825976 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/mysql-connector-java-3.0.16-ga-bin.jar
+21004000-2100a000 r-xs 00059000 08:04 825959 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/mail-1.4.jar
+2100a000-2100c000 r-xs 0000a000 08:04 826069 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/lucene-highlighter-2.9.3.jar
+2100c000-2101f000 r-xs 000fe000 08:04 825936 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/lucene-core-2.9.3.jar
+2101f000-21024000 r-xs 0002d000 08:04 826045 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/lucene-analyzers-2.9.3.jar
+21024000-2102b000 r-xs 00053000 08:04 826002 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/log4j-1.2.14.jar
+2102b000-21032000 r-xs 0003c000 08:04 826011 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/ldap.jar
+21032000-21041000 r-xs 00071000 08:04 826035 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/joda-time-1.4.jar
+21041000-21044000 ---p 00000000 00:00 0
+21044000-21092000 rwxp 00000000 00:00 0
+21092000-21093000 r-xs 00006000 08:04 825980 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/taglibs-mailer.jar
+21093000-21095000 r-xs 00005000 08:04 826001 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/stax-api-1.0.1.jar
+21095000-2109b000 r-xs 00034000 08:04 826014 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/junit-4.8.1.jar
+2109b000-210a2000 r-xs 00028000 08:04 826073 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jgrapht-jdk1.5.jar
+210a2000-210ab000 r-xs 00065000 08:04 826004 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jga-0.8.jar
+210ab000-210ce000 r-xs 001ad000 08:04 826038 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3.jar
+210ce000-210e7000 r-xs 00157000 08:04 826010 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3-tests.jar
+210e7000-21100000 r-xs 0021e000 08:04 825971 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3-sources.jar
+21100000-211fa000 rwxp 00000000 00:00 0
+211fa000-21200000 ---p 00000000 00:00 0
+21200000-21203000 r-xs 0003a000 08:04 825989 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jtidy-8.0-20060801.124516-2.jar
+21203000-2120e000 r-xs 000e7000 08:04 826019 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jena-2.6.3-test-sources.jar
+2120e000-21210000 r-xs 00023000 08:04 825954 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jdom.jar
+21210000-21213000 r-xs 00023000 08:04 826070 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jdom-1.0.jar
+21213000-21215000 r-xs 00003000 08:04 826054 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jcl-over-slf4j-1.5.5.jar
+21215000-21217000 r-xs 0001c000 08:04 826072 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jcalendar.jar
+21217000-21219000 r-xs 00006000 08:04 825956 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jaxrpc.jar
+21219000-2121b000 r-xs 0000e000 08:04 825974 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jakarta-oro-2.0.8.jar
+2121b000-21224000 r-xs 00058000 08:04 825981 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jakarta-jstl1.2-standard.jar
+21224000-21232000 r-xs 0065f000 08:09 5250039 /home/opt/jdk1.6.0_11/jre/lib/charsets.jar
+21232000-21233000 r-xs 00003000 08:04 826076 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/taglibs-random.jar
+21233000-21235000 r-xs 00004000 08:04 826039 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jakarta-jstl1.2-jstl.jar
+21235000-21249000 r-xs 001bd000 08:04 825945 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jai_core.jar
+21249000-2124d000 r-xs 0003c000 08:04 825998 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/jai_codec.jar
+2124d000-21250000 r-xs 00023000 08:04 825960 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/iri-0.8.jar
+21250000-21252000 r-xs 00032000 08:04 826059 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/iri-0.8-sources.jar
+21252000-2126b000 r-xs 002fd000 08:04 825972 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/icu4j-3.4.4.jar
+2126b000-21279000 r-xs 00170000 08:04 826057 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/iText-5.0.2.jar
+21279000-2127d000 r-xs 00025000 08:04 826061 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/gson-1.4.jar
+2127d000-2128d000 r-xs 000d2000 08:04 826015 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/freemarker.jar
+2128d000-2129e000 r-xs 000ce000 08:04 826058 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/fedora-client.jar
+2129e000-212a4000 r-xs 0004c000 08:04 826036 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/dwr-2.0.M2.8.jar
+212a4000-212a9000 r-xs 00048000 08:04 826062 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/dom4j-1.6.1.jar
+212a9000-212ab000 r-xs 0000c000 08:04 825997 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/cos.jar
+212ab000-212af000 r-xs 0001b000 08:04 825967 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/concurrent.jar
+212af000-212b2000 ---p 00000000 00:00 0
+212b2000-21300000 rwxp 00000000 00:00 0
+21300000-21500000 rwxp 00000000 00:00 0
+21500000-215fa000 rwxp 00000000 00:00 0
+215fa000-21600000 ---p 00000000 00:00 0
+21600000-21700000 rwxp 00000000 00:00 0
+21700000-217fe000 rwxp 00000000 00:00 0
+217fe000-21800000 ---p 00000000 00:00 0
+21800000-218f9000 rwxp 00000000 00:00 0
+218f9000-21900000 ---p 00000000 00:00 0
+21900000-219fb000 rwxp 00000000 00:00 0
+219fb000-21a00000 ---p 00000000 00:00 0
+21a00000-21a01000 r-xs 000c1000 08:04 825642 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/oim.vivo.scimapcore.jar
+21a01000-21a03000 r-xs 0000e000 08:04 825942 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-pool-1.3.jar
+21a03000-21a05000 r-xs 0000d000 08:04 825951 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-logging-1.1.1.jar
+21a05000-21a0a000 r-xs 00041000 08:04 825925 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-lang-2.6.jar
+21a0a000-21a0d000 r-xs 00024000 08:04 825940 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-io-2.0.1.jar
+21a0d000-21a10000 ---p 00000000 00:00 0
+21a10000-21a5e000 rwxp 00000000 00:00 0
+21a5e000-21a61000 ---p 00000000 00:00 0
+21a61000-21aaf000 rwxp 00000000 00:00 0
+21aaf000-21ab2000 ---p 00000000 00:00 0
+21ab2000-21b00000 rwxp 00000000 00:00 0
+21b00000-21bff000 rwxp 00000000 00:00 0
+21bff000-21c00000 ---p 00000000 00:00 0
+21c00000-21c01000 r-xs 0000c000 08:04 825964 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/json-taglib-0.4.1.jar
+21c01000-21c02000 r-xs 00002000 08:04 826044 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/csv-1.0.jar
+21c02000-21c08000 r-xs 00045000 08:04 825958 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-httpclient-3.1.jar
+21c08000-21c0b000 r-xs 0000c000 08:04 825929 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-fileupload-1.2.1.jar
+21c0b000-21c0e000 r-xs 0000f000 08:04 826006 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-discovery-0.2.jar
+21c0e000-21c12000 r-xs 0001f000 08:04 825943 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-digester-1.7.jar
+21c12000-21c15000 ---p 00000000 00:00 0
+21c15000-21c63000 rwxp 00000000 00:00 0
+21c63000-21c66000 ---p 00000000 00:00 0
+21c66000-21cb4000 rwxp 00000000 00:00 0
+21cb4000-21cb7000 ---p 00000000 00:00 0
+21cb7000-21d05000 rwxp 00000000 00:00 0
+21d05000-21d08000 ---p 00000000 00:00 0
+21d08000-21d56000 rwxp 00000000 00:00 0
+21d56000-21d59000 ---p 00000000 00:00 0
+21d59000-21da7000 rwxp 00000000 00:00 0
+21da7000-21daa000 ---p 00000000 00:00 0
+21daa000-21df8000 rwxp 00000000 00:00 0
+21df8000-21df9000 rwxs 00000000 00:04 29917203 /SYSV42341491 (deleted)
+21df9000-21f00000 rwxs 00000000 00:04 29884432 /SYSV42341490 (deleted)
+21f00000-21ffd000 rwxp 00000000 00:00 0
+21ffd000-22000000 ---p 00000000 00:00 0
+22000000-22003000 r-xs 00025000 08:04 825931 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-dbcp-1.4.jar
+22003000-22011000 r-xs 0007f000 08:04 826074 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-collections-3.2.1.jar
+22011000-22013000 r-xs 0000a000 08:04 825977 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-codec-1.3.jar
+22013000-22014000 r-xs 00008000 08:04 825926 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-cli-1.1.jar
+22014000-22019000 r-xs 00032000 08:04 826008 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-betwixt-0.7.jar
+22019000-22020000 r-xs 00079000 08:04 918920 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/wstx-asl-3.2.7.jar
+22020000-22026000 r-xs 00046000 08:04 918919 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/velocity-tools-2.0-beta3.jar
+22026000-2203b000 r-xs 00110000 08:04 918922 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-core-3.1.0.jar
+2203b000-2203f000 r-xs 00026000 08:04 825927 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/commons-beanutils-core.jar
+2203f000-22043000 r-xs 0001e000 08:04 825923 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aterm-java-1.6.jar
+22043000-22068000 r-xs 001c8000 08:04 826033 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/arq-2.8.5.jar
+22068000-2206d000 r-xs 0003c000 08:04 825941 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/arq-2.8.5-tests.jar
+2206d000-22072000 r-xs 00068000 08:04 826075 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/antlr-2.7.7.jar
+22072000-22074000 r-xs 00005000 08:04 826022 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-xml-2.2.jar
+22074000-22076000 r-xs 00003000 08:04 826037 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-webapp-core-2.3.jar
+22076000-22078000 r-xs 00002000 08:04 826046 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-text-2.2.jar
+22078000-2207a000 r-xs 00003000 08:04 825965 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-platform-info-2.4.jar
+2207a000-2207c000 r-xs 00002000 08:04 825963 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-net-2.2.jar
+2207c000-2207d000 r-xs 00002000 08:04 825928 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-lang-2.2.jar
+2207d000-2207e000 r-xs 00005000 08:04 826021 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-iteration-2.3.jar
+2207e000-22081000 rwxp 00000000 00:00 0
+22081000-220cf000 rwxp 00000000 00:00 0
+220cf000-220df000 r-xp 00000000 08:04 9220 /lib/tls/i686/cmov/libresolv-2.11.1.so
+220df000-220e0000 r-xp 00010000 08:04 9220 /lib/tls/i686/cmov/libresolv-2.11.1.so
+220e0000-220e1000 rwxp 00011000 08:04 9220 /lib/tls/i686/cmov/libresolv-2.11.1.so
+220e1000-220e3000 rwxp 00000000 00:00 0
+220e3000-220e7000 r-xp 00000000 08:04 9213 /lib/tls/i686/cmov/libnss_dns-2.11.1.so
+220e7000-220e8000 r-xp 00004000 08:04 9213 /lib/tls/i686/cmov/libnss_dns-2.11.1.so
+220e8000-220e9000 rwxp 00005000 08:04 9213 /lib/tls/i686/cmov/libnss_dns-2.11.1.so
+220e9000-220eb000 r-xp 00000000 08:04 60702 /lib/libnss_mdns4_minimal.so.2
+220eb000-220ec000 r-xp 00001000 08:04 60702 /lib/libnss_mdns4_minimal.so.2
+220ec000-220ed000 rwxp 00002000 08:04 60702 /lib/libnss_mdns4_minimal.so.2
+220ed000-220ee000 r-xs 00005000 08:04 825975 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-io-2.4.jar
+220ee000-220ef000 r-xs 00006000 08:04 826042 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-i18n-1.0.jar
+220ef000-220f0000 r-xs 00003000 08:04 825988 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-concurrent-2.2.jar
+220f0000-220f2000 r-xs 00006000 08:04 826029 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-commons-collections-2.3.jar
+220f2000-220f4000 r-xs 00004000 08:04 825992 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-core-3.4.jar
+220f4000-220f6000 r-xs 0000e000 08:04 826048 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/activation-1.1.jar
+220f6000-220fa000 r-xs 00018000 08:04 826066 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/XmlSchema-1.0.3.jar
+220fa000-22100000 r-xs 00091000 08:09 5250038 /home/opt/jdk1.6.0_11/jre/lib/jsse.jar
+22100000-221fa000 rwxp 00000000 00:00 0
+221fa000-22200000 ---p 00000000 00:00 0
+22200000-222ff000 rwxp 00000000 00:00 0
+222ff000-22300000 ---p 00000000 00:00 0
+22300000-22302000 r-xs 00004000 08:04 825922 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-webapp-base-core-3.4.jar
+22302000-2230a000 r-xs 0005f000 08:04 918918 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/velocity-1.6.1.jar
+2230a000-2230c000 r-xs 00001000 08:04 918917 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/slf4j-jdk14-1.5.5.jar
+2230c000-2230e000 r-xs 00004000 08:04 918916 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/slf4j-api-1.5.5.jar
+2230e000-22310000 r-xs 00005000 08:04 918928 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-spellchecker-3.1.0.jar
+22310000-22312000 r-xs 0000c000 08:04 918927 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-spatial-3.1.0.jar
+22312000-22314000 r-xs 0000a000 08:04 918926 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-queries-3.1.0.jar
+22314000-2231d000 r-xs 00071000 08:04 918921 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-analyzers-3.1.0.jar
+2231d000-2231f000 r-xs 00003000 08:04 918915 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/jcl-over-slf4j-1.5.5.jar
+2231f000-22332000 r-xs 000d1000 08:04 918914 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/guava-r05.jar
+22332000-22334000 r-xs 00006000 08:04 918913 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
+22334000-22338000 r-xs 0003b000 08:04 918912 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-lang-2.4.jar
+22338000-2233b000 r-xs 00018000 08:04 918911 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-io-1.4.jar
+2233b000-22341000 r-xs 00045000 08:04 918910 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-httpclient-3.1.jar
+22341000-22344000 r-xs 0000c000 08:04 918909 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-fileupload-1.2.1.jar
+22344000-22345000 r-xs 00006000 08:04 918908 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-csv-1.0-SNAPSHOT-r966014.jar
+22345000-22353000 r-xs 0007f000 08:04 918907 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-collections-3.2.1.jar
+22353000-22355000 r-xs 0000d000 08:04 918906 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-codec-1.4.jar
+22355000-2235a000 r-xs 0002a000 08:04 918905 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/commons-beanutils-1.7.0.jar
+2235a000-22360000 r-xs 0003d000 08:04 918930 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/apache-solr-solrj-3.1.0.jar
+22360000-22362000 r-xs 00004000 08:04 918904 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/apache-solr-noggit-r944541.jar
+22362000-22379000 r-xs 0013f000 08:04 918929 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/apache-solr-core-3.1.0.jar
+22379000-22380000 r-xs 00110000 08:09 5250291 /home/opt/jdk1.6.0_11/jre/lib/resources.jar
+22380000-22381000 r-xs 00001000 08:04 825982 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-logging-file-3.4.jar
+22381000-22383000 r-xs 0000c000 08:04 918925 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-misc-3.1.0.jar
+22383000-22385000 r-xs 00006000 08:04 918924 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-memory-3.1.0.jar
+22385000-22387000 r-xs 00012000 08:04 918923 /usr/local/apache-tomcat-6.0.10/webapps/vivosolr/WEB-INF/lib/lucene-highlighter-3.1.0.jar
+22387000-22400000 rwxp 00000000 00:00 0
+22400000-224fa000 rwxp 00000000 00:00 0
+224fa000-22500000 ---p 00000000 00:00 0
+22500000-225f9000 rwxp 00000000 00:00 0
+225f9000-22600000 ---p 00000000 00:00 0
+22600000-22800000 rwxp 00000000 00:00 0
+22800000-228fc000 rwxp 00000000 00:00 0
+228fc000-22900000 ---p 00000000 00:00 0
+22900000-2290b000 rwxp 00000000 00:00 0
+2290b000-22912000 r-xp 00000000 08:09 5250233 /home/opt/jdk1.6.0_11/jre/lib/i386/libnio.so
+22912000-22913000 rwxp 00006000 08:09 5250233 /home/opt/jdk1.6.0_11/jre/lib/i386/libnio.so
+22913000-22919000 r-xp 00000000 08:09 5250192 /home/opt/jdk1.6.0_11/jre/lib/i386/libmanagement.so
+22919000-2291a000 rwxp 00005000 08:09 5250192 /home/opt/jdk1.6.0_11/jre/lib/i386/libmanagement.so
+2291a000-2291d000 ---p 00000000 00:00 0
+2291d000-2296b000 rwxp 00000000 00:00 0
+2296b000-22973000 r-xs 00076000 08:04 525983 /usr/local/apache-tomcat-6.0.10/lib/jasper.jar
+22973000-22974000 r-xs 00006000 08:04 525990 /usr/local/apache-tomcat-6.0.10/lib/el-api.jar
+22974000-22976000 r-xs 00017000 08:04 525998 /usr/local/apache-tomcat-6.0.10/lib/jasper-el.jar
+22976000-22977000 r-xs 00002000 08:04 525996 /usr/local/apache-tomcat-6.0.10/lib/annotations-api.jar
+22977000-2297a000 r-xs 0001a000 08:04 525987 /usr/local/apache-tomcat-6.0.10/lib/catalina-ha.jar
+2297a000-2297d000 r-xs 00006000 08:04 525994 /usr/local/apache-tomcat-6.0.10/lib/tomcat-i18n-fr.jar
+2297d000-2298a000 r-xs 000f4000 08:04 525989 /usr/local/apache-tomcat-6.0.10/lib/catalina.jar
+2298a000-2298b000 ---p 00000000 00:00 0
+2298b000-22a0b000 rwxp 00000000 00:00 0
+22a0b000-22a0e000 ---p 00000000 00:00 0
+22a0e000-22a5c000 rwxp 00000000 00:00 0
+22a5c000-22a5f000 ---p 00000000 00:00 0
+22a5f000-22add000 rwxp 00000000 00:00 0
+22add000-22ae0000 ---p 00000000 00:00 0
+22ae0000-22b5e000 rwxp 00000000 00:00 0
+22b5e000-22b61000 ---p 00000000 00:00 0
+22b61000-22baf000 rwxp 00000000 00:00 0
+22baf000-22bb2000 ---p 00000000 00:00 0
+22bb2000-22c00000 rwxp 00000000 00:00 0
+22c00000-22cfe000 rwxp 00000000 00:00 0
+22cfe000-22d00000 ---p 00000000 00:00 0
+22d00000-22d02000 r-xs 00008000 08:04 525986 /usr/local/apache-tomcat-6.0.10/lib/tomcat-i18n-ja.jar
+22d02000-22d1d000 rwxp 00000000 00:00 0
+22d1d000-22d30000 r-xp 00000000 08:09 5250193 /home/opt/jdk1.6.0_11/jre/lib/i386/libnet.so
+22d30000-22d31000 rwxp 00013000 08:09 5250193 /home/opt/jdk1.6.0_11/jre/lib/i386/libnet.so
+22d31000-22d34000 r-xs 000cb000 08:09 5250319 /home/opt/jdk1.6.0_11/jre/lib/ext/localedata.jar
+22d34000-22d37000 ---p 00000000 00:00 0
+22d37000-22d85000 rwxp 00000000 00:00 0
+22d85000-22d88000 ---p 00000000 00:00 0
+22d88000-22dd6000 rwxp 00000000 00:00 0
+22dd6000-22e15000 r-xp 00000000 08:04 795504 /usr/lib/locale/en_US.utf8/LC_CTYPE
+22e15000-22e18000 ---p 00000000 00:00 0
+22e18000-22e66000 rwxp 00000000 00:00 0
+22e66000-22e69000 ---p 00000000 00:00 0
+22e69000-22eb7000 rwxp 00000000 00:00 0
+22eb7000-22ebc000 r-xs 00050000 08:06 69 /tmp/yjp201007231244.jar
+22ebc000-22ebd000 ---p 00000000 00:00 0
+22ebd000-22f70000 rwxp 00000000 00:00 0
+22f70000-23100000 r-xs 02ef0000 08:09 5250275 /home/opt/jdk1.6.0_11/jre/lib/rt.jar
+23100000-231f9000 rwxp 00000000 00:00 0
+231f9000-23200000 ---p 00000000 00:00 0
+23200000-2320a000 r-xs 000a2000 08:04 525984 /usr/local/apache-tomcat-6.0.10/lib/tomcat-coyote.jar
+2320a000-2320c000 r-xs 00014000 08:04 525991 /usr/local/apache-tomcat-6.0.10/lib/servlet-api.jar
+2320c000-2320e000 r-xs 00007000 08:04 525995 /usr/local/apache-tomcat-6.0.10/lib/tomcat-i18n-es.jar
+2320e000-23210000 r-xs 00012000 08:04 525988 /usr/local/apache-tomcat-6.0.10/lib/jsp-api.jar
+23210000-23212000 r-xs 0000a000 08:04 525985 /usr/local/apache-tomcat-6.0.10/lib/catalina-ant.jar
+23212000-2321e000 r-xs 0013b000 08:04 525997 /usr/local/apache-tomcat-6.0.10/lib/jasper-jdt.jar
+2321e000-2321f000 ---p 00000000 00:00 0
+2321f000-2329f000 rwxp 00000000 00:00 0
+2329f000-232a0000 ---p 00000000 00:00 0
+232a0000-23335000 rwxp 00000000 00:00 0
+23335000-233a0000 rwxp 00000000 00:00 0
+233a0000-235d2000 rwxp 00000000 00:00 0
+235d2000-2372f000 rwxp 00000000 00:00 0
+2372f000-23744000 rwxp 00000000 00:00 0
+23744000-237af000 rwxp 00000000 00:00 0
+237af000-239e1000 rwxp 00000000 00:00 0
+239e1000-23b3d000 rwxp 00000000 00:00 0
+23b3d000-23baf000 rwxp 00000000 00:00 0
+23baf000-26450000 rwxp 00000000 00:00 0
+26450000-33bb0000 rwxp 00000000 00:00 0
+33bb0000-79e50000 rwxp 00000000 00:00 0
+79e50000-a5830000 rwxp 00000000 00:00 0
+a5830000-b3bb0000 rwxp 00000000 00:00 0
+b3bb0000-b3bb5000 r-xs 00030000 08:04 525993 /usr/local/apache-tomcat-6.0.10/lib/catalina-tribes.jar
+b3bb5000-b3bcf000 rwxp 00000000 00:00 0
+b3bcf000-b3c75000 rwxp 00000000 00:00 0
+b3c75000-b42cd000 rwxp 00000000 00:00 0
+b42cd000-b6c75000 rwxp 00000000 00:00 0
+b6c75000-b6c84000 r-xp 00000000 08:09 5250210 /home/opt/jdk1.6.0_11/jre/lib/i386/libzip.so
+b6c84000-b6c86000 rwxp 0000e000 08:09 5250210 /home/opt/jdk1.6.0_11/jre/lib/i386/libzip.so
+b6c86000-b6ca9000 r-xp 00000000 08:09 5250212 /home/opt/jdk1.6.0_11/jre/lib/i386/libjava.so
+b6ca9000-b6cab000 rwxp 00023000 08:09 5250212 /home/opt/jdk1.6.0_11/jre/lib/i386/libjava.so
+b6cab000-b6cb6000 r-xp 00000000 08:09 5250245 /home/opt/jdk1.6.0_11/jre/lib/i386/libverify.so
+b6cb6000-b6cb7000 rwxp 0000b000 08:09 5250245 /home/opt/jdk1.6.0_11/jre/lib/i386/libverify.so
+b6cb7000-b6cb8000 ---p 00000000 00:00 0
+b6cb8000-b74b8000 rwxp 00000000 00:00 0
+b74b8000-b74be000 r-xp 00000000 08:04 7436 /lib/tls/i686/cmov/libnss_compat-2.11.1.so
+b74be000-b74bf000 r-xp 00006000 08:04 7436 /lib/tls/i686/cmov/libnss_compat-2.11.1.so
+b74bf000-b74c0000 rwxp 00007000 08:04 7436 /lib/tls/i686/cmov/libnss_compat-2.11.1.so
+b74c0000-b74c1000 r-xs 00001000 08:04 826012 /usr/local/apache-tomcat-6.0.10/webapps/vivo/WEB-INF/lib/aduna-appbase-logging-api-3.4.jar
+b74c1000-b74c4000 r-xs 00025000 08:04 525992 /usr/local/apache-tomcat-6.0.10/lib/tomcat-dbcp.jar
+b74c4000-b74cb000 r-xs 00000000 08:04 101751 /usr/lib/gconv/gconv-modules.cache
+b74cb000-b74d3000 rwxs 00000000 08:06 29 /tmp/hsperfdata_bdc34/17097
+b74d3000-b74fc000 rwxp 00000000 00:00 0
+b74fc000-b7647000 r-xp 00000000 08:09 2098489 /home/opt/yourkit-9.0.7/bin/linux-x86-32/libyjpagent.so
+b7647000-b7661000 rwxp 0014a000 08:09 2098489 /home/opt/yourkit-9.0.7/bin/linux-x86-32/libyjpagent.so
+b7661000-b7673000 rwxp 00000000 00:00 0
+b7673000-b7686000 r-xp 00000000 08:04 7422 /lib/tls/i686/cmov/libnsl-2.11.1.so
+b7686000-b7687000 r-xp 00012000 08:04 7422 /lib/tls/i686/cmov/libnsl-2.11.1.so
+b7687000-b7688000 rwxp 00013000 08:04 7422 /lib/tls/i686/cmov/libnsl-2.11.1.so
+b7688000-b768a000 rwxp 00000000 00:00 0
+b768a000-b768c000 r-xs 00003000 08:04 525952 /usr/local/apache-tomcat-6.0.10/bin/tomcat-juli.jar
+b768c000-b768e000 r-xs 00001000 08:04 525962 /usr/local/apache-tomcat-6.0.10/bin/commons-daemon.jar
+b768e000-b7690000 r-xs 00003000 08:04 525959 /usr/local/apache-tomcat-6.0.10/bin/bootstrap.jar
+b7690000-b7691000 rwxp 00000000 00:00 0
+b7691000-b769b000 r-xp 00000000 08:04 9214 /lib/tls/i686/cmov/libnss_files-2.11.1.so
+b769b000-b769c000 r-xp 00009000 08:04 9214 /lib/tls/i686/cmov/libnss_files-2.11.1.so
+b769c000-b769d000 rwxp 0000a000 08:04 9214 /lib/tls/i686/cmov/libnss_files-2.11.1.so
+b769d000-b76a4000 r-xp 00000000 08:04 9221 /lib/tls/i686/cmov/librt-2.11.1.so
+b76a4000-b76a5000 r-xp 00006000 08:04 9221 /lib/tls/i686/cmov/librt-2.11.1.so
+b76a5000-b76a6000 rwxp 00007000 08:04 9221 /lib/tls/i686/cmov/librt-2.11.1.so
+b76a6000-b76a9000 ---p 00000000 00:00 0
+b76a9000-b76f7000 rwxp 00000000 00:00 0
+b76f7000-b771b000 r-xp 00000000 08:04 6725 /lib/tls/i686/cmov/libm-2.11.1.so
+b771b000-b771c000 r-xp 00023000 08:04 6725 /lib/tls/i686/cmov/libm-2.11.1.so
+b771c000-b771d000 rwxp 00024000 08:04 6725 /lib/tls/i686/cmov/libm-2.11.1.so
+b771d000-b771e000 rwxp 00000000 00:00 0
+b771e000-b7871000 r-xp 00000000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7871000-b7872000 ---p 00153000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7872000-b7874000 r-xp 00153000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7874000-b7875000 rwxp 00155000 08:04 4024 /lib/tls/i686/cmov/libc-2.11.1.so
+b7875000-b7878000 rwxp 00000000 00:00 0
+b7878000-b787a000 r-xp 00000000 08:04 5520 /lib/tls/i686/cmov/libdl-2.11.1.so
+b787a000-b787b000 r-xp 00001000 08:04 5520 /lib/tls/i686/cmov/libdl-2.11.1.so
+b787b000-b787c000 rwxp 00002000 08:04 5520 /lib/tls/i686/cmov/libdl-2.11.1.so
+b787c000-b7883000 r-xp 00000000 08:09 5250240 /home/opt/jdk1.6.0_11/jre/lib/i386/jli/libjli.so
+b7883000-b7885000 rwxp 00006000 08:09 5250240 /home/opt/jdk1.6.0_11/jre/lib/i386/jli/libjli.so
+b7885000-b7886000 rwxp 00000000 00:00 0
+b7886000-b789b000 r-xp 00000000 08:04 9219 /lib/tls/i686/cmov/libpthread-2.11.1.so
+b789b000-b789c000 r-xp 00014000 08:04 9219 /lib/tls/i686/cmov/libpthread-2.11.1.so
+b789c000-b789d000 rwxp 00015000 08:04 9219 /lib/tls/i686/cmov/libpthread-2.11.1.so
+b789d000-b789f000 rwxp 00000000 00:00 0
+b789f000-b78a7000 r-xp 00000000 08:04 9216 /lib/tls/i686/cmov/libnss_nis-2.11.1.so
+b78a7000-b78a8000 r-xp 00007000 08:04 9216 /lib/tls/i686/cmov/libnss_nis-2.11.1.so
+b78a8000-b78a9000 rwxp 00008000 08:04 9216 /lib/tls/i686/cmov/libnss_nis-2.11.1.so
+b78a9000-b78af000 r-xp 00000000 08:09 5250222 /home/opt/jdk1.6.0_11/jre/lib/i386/native_threads/libhpi.so
+b78af000-b78b0000 rwxp 00006000 08:09 5250222 /home/opt/jdk1.6.0_11/jre/lib/i386/native_threads/libhpi.so
+b78b0000-b78b1000 rwxp 00000000 00:00 0
+b78b1000-b78b2000 ---p 00000000 00:00 0
+b78b2000-b78b4000 rwxp 00000000 00:00 0
+b78b4000-b78b5000 r-xp 00000000 00:00 0 [vdso]
+b78b5000-b78d0000 r-xp 00000000 08:04 2817 /lib/ld-2.11.1.so
+b78d0000-b78d1000 r-xp 0001a000 08:04 2817 /lib/ld-2.11.1.so
+b78d1000-b78d2000 rwxp 0001b000 08:04 2817 /lib/ld-2.11.1.so
+b7900000-bf800000 rwxp 00000000 00:00 0
+bf828000-bf83d000 rwxp 00000000 00:00 0 [stack]
+bf900000-c0000000 rwxp 00000000 00:00 0
+
+VM Arguments:
+jvm_args: -agentpath:/home/opt/yourkit-9.0.7/bin/linux-x86-32/libyjpagent.so=disablestacktelemetry,disableexceptiontelemetry,builtinprobes=none,delay=10000,sessionname=Tomcat -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=/usr/local/tomcat/conf/logging.properties -Xmx2G -XX:MaxPermSize=256M -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=/usr/local/tomcat/endorsed -Dcatalina.base=/usr/local/tomcat -Dcatalina.home=/usr/local/tomcat -Djava.io.tmpdir=/usr/local/tomcat/temp
+java_command: org.apache.catalina.startup.Bootstrap start
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+JAVA_HOME=/home/opt/jdk1.6.0_11
+PATH=/sbin:/usr/sbin:/home/bdc34/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/opt/scala/bin
+USERNAME=bdc34
+LD_LIBRARY_PATH=/home/opt/jdk1.6.0_11/jre/lib/i386/server:/home/opt/jdk1.6.0_11/jre/lib/i386:/home/opt/jdk1.6.0_11/jre/../lib/i386
+SHELL=/bin/bash
+DISPLAY=:0.0
+
+Signal Handlers:
+SIGSEGV: [libjvm.so+0x606fd0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGBUS: [libjvm.so+0x606fd0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGFPE: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGPIPE: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGXFSZ: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGILL: [libjvm.so+0x504690], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
+SIGUSR2: [libjvm.so+0x506b60], sa_mask[0]=0x00000000, sa_flags=0x10000004
+SIGHUP: [libjvm.so+0x506900], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGINT: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000
+SIGTERM: [libjvm.so+0x506900], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGQUIT: [libjvm.so+0x506900], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+
+
+--------------- S Y S T E M ---------------
+
+OS:squeeze/sid
+
+uname:Linux 2.6.32-31-generic #61-Ubuntu SMP Fri Apr 8 18:24:35 UTC 2011 i686
+libc:glibc 2.11.1 NPTL 2.11.1
+rlimit: STACK 8192k, CORE 0k, NPROC infinity, NOFILE 1024, AS infinity
+load average:1.31 1.17 1.03
+
+CPU:total 2 (2 cores per cpu, 1 threads per core) family 6 model 7 stepping 10, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3
+
+Memory: 4k page, physical 3602612k(104788k free), swap 4393704k(4059592k free)
+
+vm_info: Java HotSpot(TM) Server VM (11.0-b16) for linux-x86 JRE (1.6.0_11-b03), built on Nov 10 2008 01:21:35 by "java_re" with gcc 3.2.1-7a (J2SE release)
+
+time: Fri Jun 24 16:18:36 2011
+elapsed time: 178 seconds
+
diff --git a/solr/solrjClientLibs/jcl-over-slf4j-1.5.5.jar b/solr/solrjClientLibs/jcl-over-slf4j-1.5.5.jar
new file mode 100644
index 000000000..6b8ddd633
Binary files /dev/null and b/solr/solrjClientLibs/jcl-over-slf4j-1.5.5.jar differ
diff --git a/solr/solrjClientLibs/slf4j-api-1.5.5.jar b/solr/solrjClientLibs/slf4j-api-1.5.5.jar
new file mode 100644
index 000000000..4bb4abbb0
Binary files /dev/null and b/solr/solrjClientLibs/slf4j-api-1.5.5.jar differ
diff --git a/solr/solrjClientLibs/slf4j-log4j12-1.5.6.jar b/solr/solrjClientLibs/slf4j-log4j12-1.5.6.jar
new file mode 100644
index 000000000..0c40e9c8b
Binary files /dev/null and b/solr/solrjClientLibs/slf4j-log4j12-1.5.6.jar differ
diff --git a/solr/solrjClientLibs/wstx-asl-3.2.7.jar b/solr/solrjClientLibs/wstx-asl-3.2.7.jar
new file mode 100644
index 000000000..277701703
Binary files /dev/null and b/solr/solrjClientLibs/wstx-asl-3.2.7.jar differ
diff --git a/utilities/buildutils/jarjar.jar b/utilities/buildutils/jarjar.jar
new file mode 100644
index 000000000..352c00a42
Binary files /dev/null and b/utilities/buildutils/jarjar.jar differ
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
index d32fa0407..92d4e4bf7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
@@ -88,21 +88,12 @@ public interface IndividualDao extends ObjectSourceIface {
/**
* Returns an Iterator over all Individuals in the model that are user-viewable.
*/
- public abstract Iterator getAllOfThisTypeIterator();
-
- /**
- * Returns an Iterator over all Individuals in the model that are user-viewable and of the specified VClass URI.
- * @param vClassURI
- * @return
- */
- public abstract Iterator getAllOfThisVClassIterator(String vClassURI);
+ public abstract Iterator getAllOfThisTypeIterator();
/**
* Returns an Iterator over all Individuals in the model that are user-viewable and have been updated since the specified time.
*/
- public abstract Iterator getUpdatedSinceIterator(long updatedSince);
-
- int getCountOfIndividualsInVClass(String vclassURI );
+ public abstract Iterator getUpdatedSinceIterator(long updatedSince);
public boolean isIndividualOfClass(String vclassURI, String indURI);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java
index 7f530c04e..af8514422 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java
@@ -125,22 +125,7 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
/* All of the methods that return iterator don't wrap the Individual in
* a IndividualFiltering so they might cause problems */
- public Iterator getAllOfThisTypeIterator() {
- return filterAndWrap(innerIndividualDao.getAllOfThisTypeIterator(),
- filters);
- }
- public Iterator getAllOfThisVClassIterator(String classURI) {
- return filterAndWrap(
- innerIndividualDao.getAllOfThisVClassIterator(classURI),
- filters);
- }
-
- public Iterator getUpdatedSinceIterator(long updatedSince) {
- return filterAndWrap(
- innerIndividualDao.getUpdatedSinceIterator(updatedSince),
- filters);
- }
private class ToFilteredIndividual extends UnaryFunctor{
private final VitroFilters filters;
@@ -151,19 +136,21 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
public Individual fn(Individual arg) {
return new IndividualFiltering(arg,filters);
}
- }
-
-
- public int getCountOfIndividualsInVClass(String vclassURI) {
- Iterator it = innerIndividualDao.getAllOfThisVClassIterator(vclassURI);
- if( it == null ) return 0;
-
- Iterator itFiltered = Filter.filter(it,filters.getIndividualFilter());
- return (int)(Summarize.count(itFiltered,filters.getIndividualFilter()));
- }
-
+ }
+
/* ******************* unfiltered methods ****************** */
+
+ public Iterator getAllOfThisTypeIterator() {
+ return innerIndividualDao.getAllOfThisTypeIterator();
+
+ }
+
+ public Iterator getUpdatedSinceIterator(long updatedSince) {
+ return innerIndividualDao.getUpdatedSinceIterator(updatedSince);
+
+ }
+
public Collection getExternalIds(String individualURI) {
return innerIndividualDao.getExternalIds(individualURI);
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
index 50dd064f9..fdcbd30c3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
@@ -17,6 +17,7 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
+import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.joda.time.DateTime;
@@ -839,138 +840,14 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
return null;
}
- public Iterator getAllOfThisTypeIterator() {
- final List list =
- new LinkedList();
- getOntModel().enterCriticalSection(Lock.READ);
- try {
- ClosableIterator allIndIt = getOntModel().listIndividuals();
- try {
- while (allIndIt.hasNext()) {
- com.hp.hpl.jena.ontology.Individual ind = allIndIt.next();
-
- boolean userVisible = true;
- //Check for non-user visible types, maybe this should be an annotation?
- ClosableIterator typeIt = ind.listRDFTypes(false);
- try {
- while (typeIt.hasNext()) {
- Resource typeRes = typeIt.next();
- String type = typeRes.getURI();
- // brute forcing this until we implement a better strategy
- if (VitroVocabulary.PORTAL.equals(type) ||
- VitroVocabulary.LINK.equals(type) ||
- VitroVocabulary.KEYWORD.equals(type) ||
- VitroVocabulary.KEYWORD_INDIVIDUALRELATION.equals(type) ||
- VitroVocabulary.CLASSGROUP.equals(type) ||
- VitroVocabulary.PROPERTYGROUP.equals(type) ||
- VitroVocabulary.APPLICATION.equals(type)) {
- userVisible = false;
- break;
- }
- if( OWL.ObjectProperty.getURI().equals(type) ||
- OWL.DatatypeProperty.getURI().equals(type) ||
- OWL.AnnotationProperty.getURI().equals(type) ||
- RDF.type.getURI().equals(type) ){
- userVisible = false;
- break;
- }
- }
- } finally {
- typeIt.close();
- }
- if (userVisible) {
- list.add(ind);
- }
-
- }
- } finally {
- allIndIt.close();
- }
- } finally {
- getOntModel().leaveCriticalSection();
- }
- if (list.size() >0){
- return new Iterator(){
- Iterator innerIt = list.iterator();
- public boolean hasNext() {
- return innerIt.hasNext();
- }
- public Individual next() {
- return new IndividualJena(innerIt.next(), (WebappDaoFactoryJena) getWebappDaoFactory());
- }
- public void remove() {
- //not used
- }
- };
- }
- else
- return null;
+ public Iterator getAllOfThisTypeIterator() {
+ //this is implemented in IndivdiualSDB
+ throw new NotImplementedException();
}
- public Iterator getAllOfThisVClassIterator(String vClassURI) {
- getOntModel().enterCriticalSection(Lock.READ);
- try {
- List ents = new LinkedList();
- OntClass cls = getOntModel().getOntClass(vClassURI);
- Iterator extends OntResource> indIt = cls.listInstances();
- while (indIt.hasNext()) {
- OntResource ind = indIt.next();
- ents.add(new IndividualJena(ind, (WebappDaoFactoryJena) getWebappDaoFactory()));
- }
- return ents.iterator();
- } finally {
- getOntModel().leaveCriticalSection();
- }
- }
-
- public Iterator getUpdatedSinceIterator(long updatedSince){
- List ents = new ArrayList();
- Date since = new DateTime(updatedSince).toDate();
- String sinceStr = xsdDateTimeFormat.format(since);
- getOntModel().enterCriticalSection(Lock.READ);
- try {
- Property modTimeProp = MODTIME;
- if (modTimeProp == null)
- modTimeProp = getOntModel().getProperty(VitroVocabulary.MODTIME);
- if (modTimeProp == null)
- return null; // throw an exception?
- String queryStr = "PREFIX vitro: <"+ VitroVocabulary.vitroURI+"> " +
- "PREFIX xsd: " +
- "SELECT ?ent " +
- "WHERE { " +
- " ?ent vitro:modTime ?modTime ." +
- " FILTER (xsd:dateTime(?modTime) >= \""+sinceStr+"\"^^xsd:dateTime) " +
- "}";
- Query query = QueryFactory.create(queryStr);
- QueryExecution qe = QueryExecutionFactory.create(query,getOntModel());
- ResultSet results = qe.execSelect();
- while (results.hasNext()) {
- QuerySolution qs = (QuerySolution) results.next();
- Resource res = (Resource) qs.get("?ent");
- com.hp.hpl.jena.ontology.Individual ent = getOntModel().getIndividual(res.getURI());
- if (ent != null) {
- boolean userVisible = false;
- ClosableIterator typeIt = ent.listRDFTypes(true);
- try {
- while (typeIt.hasNext()) {
- Resource typeRes = typeIt.next();
- if (typeRes.getNameSpace() == null || (!NONUSER_NAMESPACES.contains(typeRes.getNameSpace()))) {
- userVisible = true;
- break;
- }
- }
- } finally {
- typeIt.close();
- }
- if (userVisible) {
- ents.add(new IndividualJena(ent, (WebappDaoFactoryJena) getWebappDaoFactory()));
- }
- }
- }
- } finally {
- getOntModel().leaveCriticalSection();
- }
- return ents.iterator();
+ public Iterator getUpdatedSinceIterator(long updatedSince){
+ //this is implemented in IndivdiualSDB
+ throw new NotImplementedException();
}
public boolean isIndividualOfClass(String vclassURI, String indURI) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
index 35b4b29fe..31b69a561 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
@@ -423,7 +423,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
}
@Override
- public Iterator getAllOfThisTypeIterator() {
+ public Iterator getAllOfThisTypeIterator() {
final List list =
new LinkedList();
@@ -455,7 +455,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
w.close();
}
- return getIndividualIterator(list);
+ return list.iterator();
}
@@ -485,30 +485,10 @@ public class IndividualDaoSDB extends IndividualDaoJena {
}
else
return null;
- }
-
- @Override
- public Iterator getAllOfThisVClassIterator(String vClassURI) {
- getOntModel().enterCriticalSection(Lock.READ);
- try {
- List individualURIs = new ArrayList();
- OntClass cls = getOntModel().getOntClass(vClassURI);
- Iterator indIt = cls.listInstances();
- while (indIt.hasNext()) {
- com.hp.hpl.jena.ontology.Individual ind =
- (com.hp.hpl.jena.ontology.Individual) indIt.next();
- if (ind.getURI() != null) {
- individualURIs.add(ind.getURI());
- }
- }
- return getIndividualIterator(individualURIs);
- } finally {
- getOntModel().leaveCriticalSection();
- }
- }
+ }
@Override
- public Iterator getUpdatedSinceIterator(long updatedSince){
+ public Iterator getUpdatedSinceIterator(long updatedSince){
List individualURIs = new ArrayList();
Date since = new DateTime(updatedSince).toDate();
String sinceStr = xsdDateTimeFormat.format(since);
@@ -540,7 +520,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
} finally {
getOntModel().leaveCriticalSection();
}
- return getIndividualIterator(individualURIs);
+ return individualURIs.iterator();
}
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexConstants.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexConstants.java
new file mode 100644
index 000000000..d7066b5be
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexConstants.java
@@ -0,0 +1,9 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.search;
+
+public class IndexConstants {
+ public static String INDEX_REBUILD_REQUESTED_AT_STARTUP = "INDEX_REBUILD_REQUESTED_AT_STARTUP";
+ public static String SEARCH_DATAPROPERTY_BLACKLIST ="SEARCH_DATAPROPERTY_BLACKLIST";
+ public static String SEARCH_OBJECTPROPERTY_BLACKLIST = "SEARCH_OBJECTPROPERTY_BLACKLIST";
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java
index 41ddcf605..c2ccdb5be 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java
@@ -3,13 +3,11 @@
package edu.cornell.mannlib.vitro.webapp.search.beans;
import java.util.Iterator;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
public interface ObjectSourceIface {
- Iterator getAllOfThisTypeIterator();
+ Iterator getAllOfThisTypeIterator();
- Iterator getUpdatedSinceIterator(long msSinceEpoc);
+ Iterator getUpdatedSinceIterator(long msSinceEpoc);
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
index aa37476ab..92216eb5e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
@@ -39,7 +39,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
import edu.cornell.mannlib.vitro.webapp.search.SearchException;
import edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames;
import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneIndexFactory;
-import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup;
/**
* AutocompleteController generates autocomplete content
@@ -145,11 +144,11 @@ public class AutocompleteController extends VitroAjaxController {
}
private Analyzer getAnalyzer(ServletContext servletContext) throws SearchException {
- Object obj = servletContext.getAttribute(LuceneSetup.ANALYZER);
- if( obj == null || !(obj instanceof Analyzer) )
+// //Object obj = servletContext.getAttribute(LuceneSetup.ANALYZER);
+// if( obj == null || !(obj instanceof Analyzer) )
throw new SearchException("Could not get analyzer");
- else
- return (Analyzer)obj;
+// else
+// return (Analyzer)obj;
}
private Query getQuery(VitroRequest vreq, Analyzer analyzer,
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
index 2503aeeeb..4e8a21974 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
@@ -67,7 +67,6 @@ import edu.cornell.mannlib.vitro.webapp.search.lucene.CustomSimilarity;
import edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc;
import edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc.VitroLuceneTermNames;
import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneIndexFactory;
-import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.LinkTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ListedIndividualTemplateModel;
import freemarker.template.Configuration;
@@ -585,11 +584,11 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
}
private Analyzer getAnalyzer(ServletContext servletContext) throws SearchException {
- Object obj = servletContext.getAttribute(LuceneSetup.ANALYZER);
- if( obj == null || !(obj instanceof Analyzer) )
+// Object obj = servletContext.getAttribute(LuceneSetup.ANALYZER);
+// if( obj == null || !(obj instanceof Analyzer) )
throw new SearchException("Could not get analyzer");
- else
- return (Analyzer)obj;
+// else
+// return (Analyzer)obj;
}
private Query getQuery(VitroRequest request,
@@ -777,16 +776,18 @@ public class PagedSearchController extends FreemarkerHttpServlet implements Sear
@SuppressWarnings("unchecked")
private HashSet getDataPropertyBlacklist(){
- HashSetdpBlacklist = (HashSet)
- getServletContext().getAttribute(LuceneSetup.SEARCH_DATAPROPERTY_BLACKLIST);
- return dpBlacklist;
+// HashSetdpBlacklist = (HashSet)
+// getServletContext().getAttribute(LuceneSetup.SEARCH_DATAPROPERTY_BLACKLIST);
+// return dpBlacklist;
+ return null;
}
@SuppressWarnings("unchecked")
private HashSet getObjectPropertyBlacklist(){
- HashSetopBlacklist = (HashSet)
- getServletContext().getAttribute(LuceneSetup.SEARCH_OBJECTPROPERTY_BLACKLIST);
- return opBlacklist;
+// HashSetopBlacklist = (HashSet)
+// getServletContext().getAttribute(LuceneSetup.SEARCH_OBJECTPROPERTY_BLACKLIST);
+// return opBlacklist;
+ return null;
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java
index 07ad6e1d0..975e8e800 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java
@@ -44,12 +44,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.search.IndexConstants;
import edu.cornell.mannlib.vitro.webapp.search.SearchException;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
import edu.cornell.mannlib.vitro.webapp.search.beans.VitroHighlighter;
import edu.cornell.mannlib.vitro.webapp.search.beans.VitroQuery;
import edu.cornell.mannlib.vitro.webapp.search.beans.VitroQueryFactory;
-import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup;
import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.LinkTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ListedIndividualTemplateModel;
@@ -603,14 +603,14 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet {
@SuppressWarnings({ "unchecked", "unused" })
private HashSet getDataPropertyBlacklist(){
HashSetdpBlacklist = (HashSet)
- getServletContext().getAttribute(LuceneSetup.SEARCH_DATAPROPERTY_BLACKLIST);
+ getServletContext().getAttribute(IndexConstants.SEARCH_DATAPROPERTY_BLACKLIST);
return dpBlacklist;
}
@SuppressWarnings({ "unchecked", "unused" })
private HashSet getObjectPropertyBlacklist(){
HashSetopBlacklist = (HashSet)
- getServletContext().getAttribute(LuceneSetup.SEARCH_OBJECTPROPERTY_BLACKLIST);
+ getServletContext().getAttribute(IndexConstants.SEARCH_OBJECTPROPERTY_BLACKLIST);
return opBlacklist;
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
index 2d128c4c5..546687769 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
@@ -7,24 +7,15 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
-import java.util.Stack;
-import java.util.Queue;
import javax.servlet.ServletContext;
-import org.apache.solr.client.solrj.SolrServer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.search.beans.ObjectSourceIface;
-import edu.cornell.mannlib.vitro.webapp.search.solr.CalculateParameters;
/**
@@ -41,32 +32,35 @@ import edu.cornell.mannlib.vitro.webapp.search.solr.CalculateParameters;
*
*/
public class IndexBuilder extends Thread {
- private List sourceList = new LinkedList();
- private IndexerIface indexer = null;
- private ServletContext context = null;
+ private WebappDaoFactory wdf;
+ private final IndexerIface indexer;
+ private final ServletContext context;
/* changedUris should only be accessed from synchronized blocks */
private HashSet changedUris = null;
- private List updatedInds = null;
- private List deletedInds = null;
+ private List updatedInds = null;
+ private List deletedInds = null;
private boolean reindexRequested = false;
protected boolean stopRequested = false;
protected long reindexInterval = 1000 * 60 /* msec */ ;
+ protected int numberOfThreads = 10;
+
public static final boolean UPDATE_DOCS = false;
public static final boolean NEW_DOCS = true;
-
+
private static final Log log = LogFactory.getLog(IndexBuilder.class);
- public IndexBuilder(ServletContext context,
+ public IndexBuilder(
+ ServletContext context,
IndexerIface indexer,
- List sources){
+ WebappDaoFactory wdf){
super("IndexBuilder");
this.indexer = indexer;
- this.sourceList = sources;
- this.context = context;
+ this.wdf = wdf;
+ this.context = context;
this.changedUris = new HashSet();
this.start();
@@ -74,22 +68,17 @@ public class IndexBuilder extends Thread {
protected IndexBuilder(){
//for testing only
- this( null, null, Collections.emptyList());
+ this( null, null, null);
}
- public void addObjectSource(ObjectSourceIface osi) {
- if (osi != null)
- sourceList.add(osi);
+ public void setWdf(WebappDaoFactory wdf){
+ this.wdf = wdf;
}
public boolean isIndexing(){
return indexer.isIndexing();
}
- public List getObjectSourceList() {
- return sourceList;
- }
-
public synchronized void doIndexRebuild() {
//set flag for full index rebuild
this.reindexRequested = true;
@@ -106,10 +95,16 @@ public class IndexBuilder extends Thread {
this.notifyAll();
}
+ /**
+ * Use this method to add URIs that need to be indexed.
+ */
public synchronized void addToChangedUris(String uri){
changedUris.add(uri);
}
+ /**
+ * Use this method to add URIs that need to be indexed.
+ */
public synchronized void addToChangedUris(Collection uris){
changedUris.addAll(uris);
}
@@ -124,7 +119,8 @@ public class IndexBuilder extends Thread {
public synchronized void stopIndexingThread() {
stopRequested = true;
- this.notifyAll();
+ this.notifyAll();
+ this.interrupt();
}
@Override
@@ -145,10 +141,14 @@ public class IndexBuilder extends Thread {
} catch (InterruptedException e) {
log.debug("woken up",e);
}catch(Throwable e){
- log.error(e,e);
+ if( log != null )//may be null on shutdown
+ log.error(e,e);
}
}
- log.info("Stopping IndexBuilder thread");
+
+
+ if(log != null )//may be null on shutdown
+ log.info("Stopping IndexBuilder thread");
}
@@ -164,65 +164,48 @@ public class IndexBuilder extends Thread {
*/
private void makeAddAndDeleteLists( Collection uris){
/* clear updateInds and deletedUris. This is the only method that should set these. */
- this.updatedInds = new ArrayList();
- this.deletedInds = new ArrayList();
-
- WebappDaoFactory wdf = (WebappDaoFactory)context.getAttribute("webappDaoFactory");
+ this.updatedInds = new ArrayList();
+ this.deletedInds = new ArrayList();
+
for( String uri: uris){
if( uri != null ){
Individual ind = wdf.getIndividualDao().getIndividualByURI(uri);
if( ind != null)
- this.updatedInds.add(ind);
+ this.updatedInds.add(uri);
else{
log.debug("found delete in changed uris");
- this.deletedInds.add(ind);
+ this.deletedInds.add(uri);
}
}
- }
-
- this.updatedInds = addDepResourceClasses(updatedInds);
+ }
}
+ /**
+ * This rebuilds the whole index.
+ */
protected void indexRebuild() {
log.info("Rebuild of search index is starting.");
- List> listOfIterators = new LinkedList>();
- for (ObjectSourceIface objectSource: sourceList) {
- if (objectSource != null) {
- listOfIterators.add(((objectSource)
- .getAllOfThisTypeIterator()));
- }
- }
-
// clear out changed uris since we are doing a full index rebuild
getAndEmptyChangedUris();
-
- if (listOfIterators.size() == 0)
- log.warn("Warning: no ObjectSources found.");
-
- doBuild(listOfIterators, Collections.emptyList() );
+
+ log.debug("Getting all URIs in the model");
+ Iterator uris = wdf.getIndividualDao().getAllOfThisTypeIterator();
+
+ doBuild(uris, Collections.emptyList() );
+
if( log != null ) //log might be null if system is shutting down.
log.info("Rebuild of search index is complete.");
}
protected void updatedIndex() {
log.debug("Starting updateIndex()");
- long since = indexer.getModified() - 60000;
-
- List> listOfIterators =
- new LinkedList>();
-
- for (ObjectSourceIface objectSource: sourceList) {
- if (objectSource != null) {
- listOfIterators.add(((objectSource)
- .getUpdatedSinceIterator(since)));
- }
- }
+ //long since = indexer.getModified() - 60000;
+ //List updatedUris = wdf.getIndividualDao().getUpdatedSinceIterator(since);
- makeAddAndDeleteLists( getAndEmptyChangedUris());
- listOfIterators.add( (new IndexBuilder.BuilderObjectSource(updatedInds)).getUpdatedSinceIterator(0) );
+ makeAddAndDeleteLists( getAndEmptyChangedUris() );
- doBuild( listOfIterators, deletedInds );
+ doBuild( updatedInds.iterator(), deletedInds );
log.debug("Ending updateIndex()");
}
@@ -240,7 +223,7 @@ public class IndexBuilder extends Thread {
* to false, and a check is made before adding, it will work fine; but
* checking if an object is on the index is slow.
*/
- private void doBuild(List> sourceIterators, Collection deletes ){
+ private void doBuild(Iterator updates, Collection deletes ){
boolean aborted = false;
boolean newDocs = reindexRequested;
boolean forceNewIndex = reindexRequested;
@@ -253,19 +236,12 @@ public class IndexBuilder extends Thread {
reindexRequested = false;
if( ! forceNewIndex ){
- for(Individual deleteMe : deletes ){
+ for(String deleteMe : deletes ){
indexer.removeFromIndex(deleteMe);
}
}
- //get an iterator for all of the sources of indexable objects
- for (Iterator sourceIterator: sourceIterators) {
- if (sourceIterator == null) {
- log.warn("skipping null iterator");
- } else {
- indexForSource(sourceIterator, newDocs);
- }
- }
+ indexUriList(updates, newDocs);
} catch (AbortIndexing abort){
if( log != null)
log.debug("aborting the indexing because thread stop was requested");
@@ -286,140 +262,100 @@ public class IndexBuilder extends Thread {
* Use the back end indexer to index each object that the Iterator returns.
* @throws AbortIndexing
*/
- private void indexForSource(Iterator individuals , boolean newDocs) throws AbortIndexing{
-
- int count = 0;
- int numOfThreads = 10;
-
-
- List workers = new ArrayList();
- boolean distributing = true;
-
+ private void indexUriList(Iterator updateUris , boolean newDocs) throws AbortIndexing{
+ //make a copy of numberOfThreads so the local copy is safe during this method.
+ int numberOfThreads = this.numberOfThreads;
IndexWorkerThread.setStartTime(System.currentTimeMillis());
-
- for(int i = 0; i< numOfThreads ;i++){
- workers.add(new IndexWorkerThread(indexer,i,distributing)); // made a pool of workers
- }
+
+ //make lists of work URIs for workers
+ List> workLists = makeWorkerUriLists(updateUris, numberOfThreads);
+
+ //setup workers with work
+ List workers = new ArrayList();
+ for(int i = 0; i< numberOfThreads ;i++){
+ Iterator workToDo = new UriToIndividualIterator(workLists.get(i), wdf);
+ workers.add( new IndexWorkerThread(indexer, i, workToDo) );
+ }
+
+ log.debug("Starting the building and indexing of documents in worker threads");
+ // starting worker threads
+ for(int i =0; i < numberOfThreads; i++){
+ workers.get(i).start();
+ }
- log.info("Indexing worker pool ready for indexing.");
-
- // starting worker threads
-
- for(int i =0; i < numOfThreads; i++){
- workers.get(i).start();
- }
-
-
- while(individuals.hasNext()){
- if( stopRequested )
- throw new AbortIndexing();
-
- Individual ind = null;
- try{
- ind = individuals.next();
-
- workers.get(count%numOfThreads).addToQueue(ind); // adding individual to worker queue.
-
- }catch(Throwable ex){
- if( stopRequested || log == null){//log might be null if system is shutting down.
- throw new AbortIndexing();
- }
- String uri = ind!=null?ind.getURI():"null";
- log.warn("Error indexing individual " + uri + " " + ex.getMessage());
- }
- count++;
- }
-
- for(int i =0 ; i < numOfThreads; i ++){
- workers.get(i).setDistributing(false);
- }
- for(int i =0; i < numOfThreads; i++){
+ //waiting for all the work to finish
+ for(int i =0; i < numberOfThreads; i++){
try{
workers.get(i).join();
}catch(InterruptedException e){
- log.error(e,e);
+ //this thread will get interrupted if the system is trying to shut down.
+ if( log != null )
+ log.debug(e,e);
+ for( IndexWorkerThread thread: workers){
+ thread.requestStop();
+ }
+ return;
}
}
- IndexWorkerThread.resetCount();
-
+ IndexWorkerThread.resetCount();
}
-
- /**
- * For a list of individuals, this builds a list of dependent resources and returns it.
- */
- private List addDepResourceClasses(List inds) {
- WebappDaoFactory wdf = (WebappDaoFactory)context.getAttribute("webappDaoFactory");
- VClassDao vClassDao = wdf.getVClassDao();
- Iterator it = inds.iterator();
- VClass depResVClass = new VClass(VitroVocabulary.DEPENDENT_RESORUCE);
- while(it.hasNext()){
- Individual ind = it.next();
- List classes = ind.getVClasses();
- boolean isDepResource = false;
- for( VClass clazz : classes){
- if( !isDepResource && VitroVocabulary.DEPENDENT_RESORUCE.equals( clazz.getURI() ) ){
- isDepResource = true;
- break;
- }
- }
- if( ! isDepResource ){
- for( VClass clazz : classes){
- List superClassUris = vClassDao.getAllSuperClassURIs(clazz.getURI());
- for( String uri : superClassUris){
- if( VitroVocabulary.DEPENDENT_RESORUCE.equals( uri ) ){
- isDepResource = true;
- break;
- }
- }
- if( isDepResource )
- break;
- }
- }
- if( isDepResource){
- classes.add(depResVClass);
- ind.setVClasses(classes, true);
- }
- }
- return inds;
- }
+
/* maybe ObjectSourceIface should be replaced with just an iterator. */
- private class BuilderObjectSource implements ObjectSourceIface {
- private final List individuals;
- public BuilderObjectSource( List individuals){
- this.individuals=individuals;
- }
+ protected class UriToIndividualIterator implements Iterator{
+ private final Iterator uris;
+ private final WebappDaoFactory wdf;
+
+ public UriToIndividualIterator( Iterator uris, WebappDaoFactory wdf){
+ this.uris= uris;
+ this.wdf = wdf;
+ }
+
+ public UriToIndividualIterator( List uris, WebappDaoFactory wdf){
+ this.uris= uris.iterator();
+ this.wdf = wdf;
+ }
+
@Override
- public Iterator getAllOfThisTypeIterator() {
- return new Iterator(){
- final Iterator it = individuals.iterator();
-
- @Override
- public boolean hasNext() {
- return it.hasNext();
- }
-
- @Override
- public Individual next() {
- return it.next();
- }
-
- @Override
- public void remove() { /* not implemented */}
- };
- }
+ public boolean hasNext() {
+ return uris.hasNext();
+ }
+
+ /** may return null */
@Override
- public Iterator getUpdatedSinceIterator(long msSinceEpoc) {
- return getAllOfThisTypeIterator();
+ public Individual next() {
+ String uri = uris.next();
+ return wdf.getIndividualDao().getIndividualByURI(uri);
+ }
+
+ @Override
+ public void remove() {
+ throw new IllegalAccessError("");
}
}
+ private static List> makeWorkerUriLists(Iterator uris,int workers){
+ List> work = new ArrayList>(workers);
+ for(int i =0; i< workers; i++){
+ work.add( new ArrayList() );
+ }
+
+ int counter = 0;
+ while(uris.hasNext()){
+ work.get( counter % workers ).add( uris.next() );
+ counter ++;
+ }
+ return work;
+ }
+
+
private class AbortIndexing extends Exception {
// Just a vanilla exception
}
+
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java
index ae72b7fa5..8b0cc69e5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java
@@ -1,89 +1,72 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
package edu.cornell.mannlib.vitro.webapp.search.indexing;
-
-import java.util.LinkedList;
-import java.util.Queue;
+import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
import edu.cornell.mannlib.vitro.webapp.search.solr.IndividualToSolrDocument;
-
-
class IndexWorkerThread extends Thread{
+ protected final int threadNum;
protected IndividualToSolrDocument individualToSolrDoc;
- private IndexerIface indexer = null;
- private Log log = LogFactory.getLog(IndexWorkerThread.class);
- private static long count=0;
- private Queue indQueue = new LinkedList();
- private int threadNum;
- private static long starttime = 0;
- private boolean distributing;
+ protected final IndexerIface indexer;
+ protected final Iterator individualsToIndex;
+ protected boolean stopRequested = false;
- public IndexWorkerThread(IndexerIface indexer, int threadNum,boolean distributing){
+ private Log log = LogFactory.getLog(IndexWorkerThread.class);
+ private static long count=0;
+ private static long starttime = 0;
+
+ public IndexWorkerThread(IndexerIface indexer, int threadNum , Iterator individualsToIndex){
+ super("IndexWorkerThread"+threadNum);
this.indexer = indexer;
this.threadNum = threadNum;
- this.distributing = distributing;
- /*synchronized(this){
- if(starttime == 0)
- starttime = System.currentTimeMillis();
- }*/
+ this.individualsToIndex = individualsToIndex;
+ }
+
+ public void requestStop(){
+ stopRequested = true;
}
- public void addToQueue(Individual ind){
- synchronized(indQueue){
- indQueue.offer(ind);
- indQueue.notify();
- }
- }
-
- public boolean isQueueEmpty(){
- return indQueue.isEmpty();
- }
-
- public void setDistributing(boolean distributing){
- this.distributing = distributing;
- }
-
- public void run(){
-
- while(this.distributing){
- synchronized(indQueue){
- try{
- while(indQueue.isEmpty() && this.distributing){
- try{
- log.debug("Worker number " + threadNum + " waiting on some work to be alloted.");
- indQueue.wait(1000);
- }catch(InterruptedException ie){
- log.error(ie,ie);
- }
- }
-
- Thread.sleep(50); //wait a bit to let a bit more work to come into the queue
- log.debug("work found for Woker number " + threadNum);
- addDocsToIndex();
-
- } catch (InterruptedException e) {
- log.debug("Worker number " + threadNum + " woken up",e);
- }
- catch(Throwable e){
- log.error(e,e);
- }
- }
- }
+ public void run(){
+
+ while( ! stopRequested ){
+
+ //do the actual indexing work
+ log.debug("work found for Woker number " + threadNum);
+ addDocsToIndex();
+
+ // done so shut this thread down.
+ stopRequested = true;
+ }
log.info("Worker number " + threadNum + " exiting.");
}
- protected void addDocsToIndex() throws IndexingException{
+ protected void addDocsToIndex() {
- while(!indQueue.isEmpty()){
- indexer.index(indQueue.poll());
+ while( individualsToIndex.hasNext() ){
+ //need to stop right away if requested to
+ if( stopRequested ) return;
+
+ //build the document and add it to the index
+ Individual ind = null;
+ try {
+ ind = individualsToIndex.next();
+ indexer.index( ind );
+ } catch (IndexingException e) {
+ if( ind != null )
+ log.error("Could not index individual " + ind.getURI() , e );
+ else
+ log.warn("Could not index, individual was null");
+ }
+
+
synchronized(this){
count++;
if( log.isInfoEnabled() ){
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexerIface.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexerIface.java
index f4ee9a057..8c5ff126b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexerIface.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexerIface.java
@@ -46,7 +46,7 @@ public interface IndexerIface {
* @param obj
* @throws IndexingException
*/
- public void removeFromIndex(Individual ind) throws IndexingException;
+ public void removeFromIndex(String uri) throws IndexingException;
public void prepareForRebuild() throws IndexingException;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
index d685c9be9..06ff64007 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneIndexer.java
@@ -479,5 +479,11 @@ public class LuceneIndexer implements IndexerIface {
public void index(Individual ind) throws IndexingException {
// TODO Auto-generated method stub
- }
+ }
+
+ @Override
+ public void removeFromIndex(String uri) throws IndexingException {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
index f6aa8f796..2ad41d8ed 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetup.java
@@ -144,7 +144,8 @@ public class LuceneSetup implements javax.servlet.ServletContextListener {
List sources = new ArrayList();
sources.add(wadf.getIndividualDao());
- IndexBuilder builder = new IndexBuilder(context, indexer, sources);
+ //IndexBuilder builder = new IndexBuilder(context, indexer, sources);
+ IndexBuilder builder = new IndexBuilder(context, indexer, wadf);
// here we add the IndexBuilder with the LuceneIndexer
// to the servlet context so we can access it later in the webapp.
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetupCJK.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetupCJK.java
index d3419a963..577b72354 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetupCJK.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/LuceneSetupCJK.java
@@ -109,7 +109,8 @@ public class LuceneSetupCJK implements javax.servlet.ServletContextListener {
List sources = new ArrayList();
sources.add(wadf.getIndividualDao());
- IndexBuilder builder = new IndexBuilder(context,indexer,sources);
+ //IndexBuilder builder = new IndexBuilder(context,indexer,sources);
+ IndexBuilder builder = new IndexBuilder(context, indexer, wadf);
// here we add the IndexBuilder with the LuceneIndexer
// to the servlet context so we can access it later in the webapp.
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java
index 87500b4ce..c067ab7e8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java
@@ -3,7 +3,6 @@
package edu.cornell.mannlib.vitro.webapp.search.solr;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
@@ -26,14 +25,10 @@ import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.QuerySolutionMap;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.ontology.OntModel;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java
index d66dad0d1..5d6ea4f44 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java
@@ -5,13 +5,16 @@ package edu.cornell.mannlib.vitro.webapp.search.solr;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
-import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory;
@@ -20,6 +23,7 @@ import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.QuerySolutionMap;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax;
+import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
@@ -29,49 +33,91 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
public class ContextNodeFields implements DocumentModifier{
-
- private static final String prefix = "prefix owl: "
- + " prefix vitroDisplay: "
- + " prefix rdf: "
- + " prefix core: "
- + " prefix foaf: "
- + " prefix rdfs: "
- + " prefix localNav: "
- + " prefix bibo: ";
-
+ private Model model;
+
+ private static ExecutorService threadPool = null;
+ private static final int THREAD_POOL_SIZE = 10;
+
private static final List singleValuedQueriesForAgent = new ArrayList();
private static final List singleValuedQueriesForInformationResource = new ArrayList();
- private static final List multiValuedQueriesForAgent = new ArrayList();
- private static final String multiValuedQueryForInformationResource;
-// private static StringBuffer objectProperties = new StringBuffer();
+ private static final List multiValuedQueriesForAgent = new ArrayList();
+ private static final String multiValuedQueryForInformationResource;
- private Log log = LogFactory.getLog(ContextNodeFields.class);
- private Dataset dataset;
+ private Log log = LogFactory.getLog(ContextNodeFields.class);
+
+ public ContextNodeFields(Model model){
+// synchronized( ContextNodeFields.class){
+// if( threadPool == null ){
+// threadPool = Executors.newFixedThreadPool(THREAD_POOL_SIZE, new ContextNodeFieldsThreadFactory());
+// }
+// }
+ this.model = model;
+ }
+
+ @Override
+ public void modifyDocument(Individual individual, SolrInputDocument doc, StringBuffer addUri) {
+ log.debug("retrieving context node values..");
-
- public ContextNodeFields(Dataset dataset){
- this.dataset = dataset;
+ StringBuffer objectProperties = singleThreadExecute( individual, multiValuedQueriesForAgent);
+
+ //change fields of solr document
+ SolrInputField targetField = doc.getField(VitroSearchTermNames.targetInfo);
+ targetField.addValue(" " + runQuery(individual, multiValuedQueryForInformationResource), targetField.getBoost());
+
+ SolrInputField field = doc.getField(VitroSearchTermNames.ALLTEXT);
+ field.addValue(objectProperties, field.getBoost());
+ log.debug("context node values are retrieved");
+ }
+
+ private StringBuffer singleThreadExecute(Individual individual, List queries ){
+ StringBuffer propertyValues = new StringBuffer(" ");
+ for(String query : queries ){
+ propertyValues.append(runQuery(individual, query));
+ }
+ return propertyValues;
}
- /* TODO: consider a constructor like this:
- * public ContextNodeFields(OntModel fullModel, List queries )
- */
-
- /*
- *TODO:
- * consider reducing the code in this class using a method like the following:
- */
- public StringBuffer runQuery( Individual individual, String query ){
- StringBuffer propertyValues = new StringBuffer();
+ /** experimental, may not work */
+ private StringBuffer multiThreadExecute(Individual individual, List queries ){
+ int queryCount = queries.size();
+
+ List tasks = new ArrayList(queryCount);
+ List> completedTasks = new ArrayList>(queryCount);
+
+ //Make a task for each query and start it.
+ for(String query : queries ){
+ QueryRunner queryTask = new QueryRunner(individual, query);
+ tasks.add(queryTask);
+ completedTasks.add( threadPool.submit( queryTask , queryTask));
+ }
+
+ //Wait for each thread to finish and collect results
+ StringBuffer objectProperties = new StringBuffer(" ");
+ for(int i = 0 ; i < queryCount; i++){
+ try {
+ completedTasks.get(i).get();
+ objectProperties.append( tasks.get(i).getPropertyValues() ) ;
+ } catch (InterruptedException e) {
+ log.error("Thread interrupted");
+ } catch (ExecutionException e) {
+ log.error("problem during execution",e);
+ e.printStackTrace();
+ }
+ }
+ return objectProperties;
+ }
+
+ public StringBuffer runQuery( Individual individual, String query ){
+ StringBuffer propertyValues = new StringBuffer();
QuerySolutionMap initialBinding = new QuerySolutionMap();
Resource uriResource = ResourceFactory.createResource(individual.getURI());
initialBinding.add("uri", uriResource);
Query sparqlQuery = QueryFactory.create( query, Syntax.syntaxARQ);
- dataset.getLock().enterCriticalSection(Lock.READ);
+ model.getLock().enterCriticalSection(Lock.READ);
try{
- QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
+ QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, model, initialBinding);
try{
ResultSet results = qExec.execSelect();
while(results.hasNext()){
@@ -93,59 +139,21 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close();
}
}finally{
- dataset.getLock().leaveCriticalSection();
+ model.getLock().leaveCriticalSection();
}
return propertyValues;
- }
+ }
-
-
-
- @Override
- public void modifyDocument(Individual individual, SolrInputDocument doc, StringBuffer addUri) {
-
- log.debug("retrieving context node values..");
-
- SolrInputField field = doc.getField(VitroSearchTermNames.ALLTEXT);
- SolrInputField targetField = doc.getField(VitroSearchTermNames.targetInfo);
- StringBuffer objectProperties = new StringBuffer();
-
-
- objectProperties.append(" ");
-
- int threadCount = multiValuedQueriesForAgent.size();
- QueryRunner[] threads = new QueryRunner[threadCount];
-
-
- //Make a thread for each query and start it.
- for(int i= 0; i < threadCount; i++){
- QueryRunner t = new QueryRunner(individual, multiValuedQueriesForAgent.get(i));
- t.start();
- threads[i] = t;
- }
-
- //Wait for each thread to finish and collect results
- for(int i = 0 ; i < threadCount ; i++){
- try {
- threads[i].join();
- objectProperties.append( threads[i].getPropertyValues() ) ;
- threads[i] = null;
- } catch (InterruptedException e) {
- log.error("Thread " + threads[i].getName() + " interrupted!");
- }
- }
-
-
-
- targetField.addValue(" " + runQuery(individual, multiValuedQueryForInformationResource), targetField.getBoost());
-
-
- field.addValue(objectProperties, field.getBoost());
- log.debug("context node values are retrieved");
-
- }
+ private static final String prefix = "prefix owl: "
+ + " prefix vitroDisplay: "
+ + " prefix rdf: "
+ + " prefix core: "
+ + " prefix foaf: "
+ + " prefix rdfs: "
+ + " prefix localNav: "
+ + " prefix bibo: ";
//single valued queries for foaf:Agent
static {
@@ -390,63 +398,43 @@ public class ContextNodeFields implements DocumentModifier{
- private class QueryRunner extends Thread{
-
- private Individual ind;
- private String query;
- private StringBuffer propertyValues = new StringBuffer();
-
- public String getPropertyValues(){
- return propertyValues.toString();
- }
+ private class QueryRunner implements Runnable {
+ private final Individual ind;
+ private final String query;
+ private final StringBuffer propertyValues = new StringBuffer();
+
public QueryRunner(Individual ind, String query){
this.ind = ind;
this.query = query;
}
+ public String getPropertyValues(){
+ return propertyValues.toString();
+ }
- public void run(){
- // StringBuffer propertyValues = new StringBuffer();
-
+ public void run(){
propertyValues.append(runQuery(ind, query));
-
-
-// QuerySolutionMap initialBinding = new QuerySolutionMap();
-// Resource uriResource = ResourceFactory.createResource(ind.getURI());
-// initialBinding.add("uri", uriResource);
-//
-// Query sparqlQuery = QueryFactory.create( query, Syntax.syntaxARQ);
-// dataset.getLock().enterCriticalSection(Lock.READ);
-// try{
-// QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
-// try{
-// ResultSet results = qExec.execSelect();
-// while(results.hasNext()){
-// QuerySolution soln = results.nextSolution();
-// Iterator iter = soln.varNames() ;
-// while( iter.hasNext()){
-// String name = iter.next();
-// RDFNode node = soln.get( name );
-// if( node != null ){
-// propertyValues.append(" " + node.toString());
-// }else{
-// log.debug(name + " is null");
-// }
-// }
-// }
-// }catch(Throwable t){
-// log.error(t,t);
-// } finally{
-// qExec.close();
-// }
-// }finally{
-// dataset.getLock().leaveCriticalSection();
-// }
-//
- //objectProperties.append(propertyValues.toString());
}
}
+
+ // count for thread names
+ private static Integer threadCounter = 0;
+
+ private static String getNewThreadName(){
+ synchronized(threadCounter){
+ Integer i = threadCounter;
+ threadCounter = threadCounter + 1;
+ return "IndexBuilder-ContextNodeFields-" + i.toString();
+ }
+ }
+
+ private class ContextNodeFieldsThreadFactory implements ThreadFactory{
+ @Override
+ public Thread newThread(Runnable r) {
+ return new Thread( getNewThreadName() );
+ }
+ }
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
index 54e432ca3..6e36f3068 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/IndividualToSolrDocument.java
@@ -9,7 +9,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.lucene.document.Document;
+import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import org.joda.time.DateTime;
@@ -41,9 +41,7 @@ public class IndividualToSolrDocument {
public List documentModifiers = new ArrayList();
private static List contextNodeClassNames = new ArrayList();
-
-
-
+
public IndividualToSolrDocument(
ClassProhibitedFromSearch classesProhibitedFromSearch,
IndividualProhibitedFromSearch individualProhibitedFromSearch){
@@ -73,7 +71,6 @@ public class IndividualToSolrDocument {
classPublicNames.append("");
SolrInputDocument doc = new SolrInputDocument();
- //DocId
String id = ind.getURI();
log.debug("translating " + id);
@@ -150,8 +147,8 @@ public class IndividualToSolrDocument {
doc.addField(term.PROHIBITED_FROM_TEXT_RESULTS, prohibited?"1":"0");
- //lucene DocID
- doc.addField(term.DOCID, entClassName + id);
+ //DocID
+ doc.addField(term.DOCID, getIdForUri( ind.getURI() ) );
//vitro id
doc.addField(term.URI, id);
@@ -292,14 +289,28 @@ public class IndividualToSolrDocument {
public Object getIndexId(Object obj) {
throw new Error("IndiviudalToSolrDocument.getIndexId() is unimplemented");
}
+
+ public String getIdForUri(String uri){
+ if( uri != null ){
+ return entClassName + uri;
+ }else{
+ return null;
+ }
+ }
+
+ public String getQueryForId(String uri ){
+ return term.DOCID + ':' + getIdForUri(uri);
+ }
public Individual unTranslate(Object result) {
Individual ent = null;
- if( result != null && result instanceof Document){
- Document hit = (Document) result;
- String id = hit.get(VitroSearchTermNames.URI);
+
+ if( result != null && result instanceof SolrDocument){
+ SolrDocument hit = (SolrDocument) result;
+ String uri= (String) hit.getFirstValue(term.URI);
+
ent = new IndividualImpl();
- ent.setURI(id);
+ ent.setURI(uri);
}
return ent;
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
index dd8435e0f..948f0fdaa 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
@@ -3,28 +3,23 @@
package edu.cornell.mannlib.vitro.webapp.search.solr;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.response.*;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.UpdateResponse;
-import org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrInputDocument;
+
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
import edu.cornell.mannlib.vitro.webapp.search.docbuilder.Obj2DocIface;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexerIface;
-import edu.cornell.mannlib.vitro.webapp.search.solr.CalculateParameters;
public class SolrIndexer implements IndexerIface {
private final static Log log = LogFactory.getLog(SolrIndexer.class);
@@ -41,6 +36,43 @@ public class SolrIndexer implements IndexerIface {
@Override
public void index(Individual ind) throws IndexingException {
+ if( ! indexing )
+ throw new IndexingException("SolrIndexer: must call " +
+ "startIndexing() before index().");
+
+ if( ind == null )
+ log.debug("Individual to index was null, ignoring.");
+
+ try{
+ if( urisIndexed.contains(ind.getURI()) ){
+ log.debug("already indexed " + ind.getURI() );
+ return;
+ }else{
+ SolrInputDocument solrDoc = null;
+ synchronized(this){
+ urisIndexed.add(ind.getURI());
+ }
+ log.debug("indexing " + ind.getURI());
+ solrDoc = individualToSolrDoc.translate(ind);
+
+ if( solrDoc != null){
+ //sending each doc individually is inefficient
+ // Collection docs = new ArrayList();
+ // docs.add( solrDoc );
+ UpdateResponse res = server.add( solrDoc );
+ log.debug("response after adding docs to server: "+ res);
+ }else{
+ log.debug("removing from index " + ind.getURI());
+ //TODO: how do we delete document?
+ //writer.deleteDocuments((Term)obj2doc.getIndexId(ind));
+ }
+ }
+ } catch (IOException ex) {
+ throw new IndexingException(ex.getMessage());
+ } catch (SolrServerException ex) {
+ throw new IndexingException(ex.getMessage());
+ }
+
if( ! indexing )
throw new IndexingException("SolrIndexer: must call " +
"startIndexing() before index().");
@@ -73,7 +105,7 @@ public class SolrIndexer implements IndexerIface {
} catch (IOException ex) {
throw new IndexingException(ex.getMessage());
} catch (SolrServerException ex) {
- throw new IndexingException(ex.getMessage());
+ throw new IndexingException(ex.getMessage());
}
}
@@ -84,14 +116,21 @@ public class SolrIndexer implements IndexerIface {
@Override
public void prepareForRebuild() throws IndexingException {
- // TODO Auto-generated method stub
-
+ // TODO Auto-generated method stub
}
@Override
- public void removeFromIndex(Individual ind) throws IndexingException {
- // TODO Auto-generated method stub
-
+ public void removeFromIndex(String uri) throws IndexingException {
+ if( uri != null ){
+ try {
+ server.deleteByQuery( individualToSolrDoc.getQueryForId(uri));
+ log.debug("deleted " + " " + uri);
+ } catch (SolrServerException e) {
+ log.error( "could not delete individual " + uri, e);
+ } catch (IOException e) {
+ log.error( "could not delete individual " + uri, e);
+ }
+ }
}
@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
index 7464fc49f..03cb4754c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
@@ -2,6 +2,7 @@
package edu.cornell.mannlib.vitro.webapp.search.solr;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -12,6 +13,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.impl.XMLResponseParser;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Dataset;
@@ -26,11 +28,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao;
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
import edu.cornell.mannlib.vitro.webapp.dao.jena.SearchReindexingListener;
import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
+import edu.cornell.mannlib.vitro.webapp.search.IndexConstants;
import edu.cornell.mannlib.vitro.webapp.search.beans.IndividualProhibitedFromSearchImpl;
-import edu.cornell.mannlib.vitro.webapp.search.beans.ObjectSourceIface;
import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
-import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.AbortStartup;
public class SolrSetup implements javax.servlet.ServletContextListener{
@@ -56,28 +57,30 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
);
return;
}
- CommonsHttpSolrServer server;
- server = new CommonsHttpSolrServer( solrServerUrl );
+ CommonsHttpSolrServer server;
+ server = new CommonsHttpSolrServer(new URL( solrServerUrl ),null,new XMLResponseParser(),false);
+ //server = new CommonsHttpSolrServer(new URL( solrServerUrl ));
server.setSoTimeout(10000); // socket read timeout
server.setConnectionTimeout(10000);
server.setDefaultMaxConnectionsPerHost(100);
server.setMaxTotalConnections(100);
server.setMaxRetries(1);
context.setAttribute(LOCAL_SOLR_SERVER, server);
-
+
/* setup the individual to solr doc translation */
//first we need a ent2luceneDoc translator
OntModel displayOntModel = (OntModel) sce.getServletContext().getAttribute("displayOntModel");
- OntModel abox = ModelContext.getBaseOntModelSelector(context).getABoxModel();
-
+ OntModel abox = ModelContext.getBaseOntModelSelector(context).getABoxModel();
OntModel inferences = (OntModel)context.getAttribute( JenaBaseDao.INFERENCE_ONT_MODEL_ATTRIBUTE_NAME);
Dataset dataset = WebappDaoFactoryJena.makeInMemoryDataset(abox, inferences);
+ OntModel jenaOntModel = ModelContext.getJenaOntModel(context);
+
List modifiers = new ArrayList();
// modifiers.add(new CalculateParameters(ModelContext.getJenaOntModel(context)));
modifiers.add(new CalculateParameters(dataset));
- modifiers.add(new ContextNodeFields(dataset));
+ modifiers.add(new ContextNodeFields(jenaOntModel));
IndividualToSolrDocument indToSolrDoc = new IndividualToSolrDocument(
new ProhibitedFromSearch(DisplayVocabulary.PRIMARY_LUCENE_INDEX_URI, displayOntModel),
@@ -88,7 +91,7 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
SolrIndexer solrIndexer = new SolrIndexer(server, indToSolrDoc);
if( solrIndexer.isIndexEmpty() ){
log.info("solr index is empty, requesting rebuild");
- sce.getServletContext().setAttribute(LuceneSetup.INDEX_REBUILD_REQUESTED_AT_STARTUP, Boolean.TRUE);
+ sce.getServletContext().setAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP, Boolean.TRUE);
}
// This is where the builder gets the list of places to try to
@@ -96,11 +99,9 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
// does not get into the search index.
WebappDaoFactory wadf = (WebappDaoFactory) context.getAttribute("webappDaoFactory");
VitroFilters vf = VitroFilterUtils.getPublicFilter(context);
- wadf = new WebappDaoFactoryFiltering(wadf, vf);
- List sources = new ArrayList();
- sources.add(wadf.getIndividualDao());
+ wadf = new WebappDaoFactoryFiltering(wadf, vf);
- IndexBuilder builder = new IndexBuilder(context, solrIndexer, sources);
+ IndexBuilder builder = new IndexBuilder(context, solrIndexer, wadf);
// to the servlet context so we can access it later in the webapp.
context.setAttribute(IndexBuilder.class.getName(), builder);
@@ -109,8 +110,8 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
SearchReindexingListener srl = new SearchReindexingListener(builder);
ModelContext.registerListenerForChanges(ctx, srl);
- if( sce.getServletContext().getAttribute(LuceneSetup.INDEX_REBUILD_REQUESTED_AT_STARTUP) instanceof Boolean &&
- (Boolean)sce.getServletContext().getAttribute(LuceneSetup.INDEX_REBUILD_REQUESTED_AT_STARTUP) ){
+ if( sce.getServletContext().getAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP) instanceof Boolean &&
+ (Boolean)sce.getServletContext().getAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP) ){
log.info("Rebuild of solr index required before startup.");
builder.doIndexRebuild();
int n = 0;
@@ -132,6 +133,9 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
@Override
public void contextDestroyed(ServletContextEvent sce) {
+ IndexBuilder builder = (IndexBuilder)sce.getServletContext().getAttribute(IndexBuilder.class.getName());
+ if( builder != null )
+ builder.stopIndexingThread();
}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
index f8ac4b245..bb5d181d5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
@@ -32,7 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
import edu.cornell.mannlib.vitro.webapp.ontology.update.KnowledgeBaseUpdater;
import edu.cornell.mannlib.vitro.webapp.ontology.update.UpdateSettings;
-import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup;
+import edu.cornell.mannlib.vitro.webapp.search.IndexConstants;
/**
* Invokes process to test whether the knowledge base needs any updating
@@ -116,7 +116,7 @@ public class UpdateKnowledgeBase implements ServletContextListener {
try {
if (ontologyUpdater.updateRequired()) {
- ctx.setAttribute(LuceneSetup.INDEX_REBUILD_REQUESTED_AT_STARTUP, Boolean.TRUE);
+ ctx.setAttribute(IndexConstants.INDEX_REBUILD_REQUESTED_AT_STARTUP, Boolean.TRUE);
//doMiscAppMetadataReplacements(ctx.getRealPath(MISC_REPLACEMENTS_FILE), oms);
reloadDisplayModel(ctx);
}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
index cdbb4d31b..a81f64b69 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
@@ -131,28 +131,16 @@ public class IndividualDaoStub implements IndividualDao {
}
@Override
- public Iterator getAllOfThisTypeIterator() {
+ public Iterator getAllOfThisTypeIterator() {
throw new RuntimeException(
"IndividualDaoStub.getAllOfThisTypeIterator() not implemented.");
- }
+ }
@Override
- public Iterator getAllOfThisVClassIterator(String vClassURI) {
- throw new RuntimeException(
- "IndividualDaoStub.getAllOfThisVClassIterator() not implemented.");
- }
-
- @Override
- public Iterator getUpdatedSinceIterator(long updatedSince) {
+ public Iterator getUpdatedSinceIterator(long updatedSince) {
throw new RuntimeException(
"IndividualDaoStub.getUpdatedSinceIterator() not implemented.");
- }
-
- @Override
- public int getCountOfIndividualsInVClass(String vclassURI) {
- throw new RuntimeException(
- "IndividualDaoStub.getCountOfIndividualsInVClass() not implemented.");
- }
+ }
@Override
public boolean isIndividualOfClass(String vclassURI, String indURI) {