diff --git a/.classpath b/.classpath index 553c7f073..3038e4c76 100644 --- a/.classpath +++ b/.classpath @@ -47,29 +47,10 @@ - - - - - - - - - - - - - - - - - - - @@ -87,6 +68,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -99,12 +102,10 @@ - - diff --git a/build.xml b/build.xml index ae4dbd1ca..375112e6e 100644 --- a/build.xml +++ b/build.xml @@ -58,7 +58,7 @@ - + @@ -69,8 +69,8 @@ - - + + @@ -83,14 +83,14 @@ - - - - - - - - + + + + + + + + @@ -100,18 +100,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -128,9 +128,9 @@ - - - + + + @@ -165,43 +165,44 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - + + @@ -216,53 +217,55 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + - - - + + + - - - + + + - + + - + - + @@ -293,7 +296,7 @@ - + @@ -302,11 +305,11 @@ - + @@ -317,19 +320,19 @@ - - - - - - - - - - + + + + + + + + + + @@ -341,13 +344,13 @@ - + - + @@ -367,7 +370,7 @@ - + @@ -400,9 +403,9 @@ - - - + + + @@ -434,7 +437,7 @@ - + @@ -447,7 +450,7 @@ - @@ -465,14 +468,14 @@ - + - + @@ -487,8 +490,8 @@ - - + + @@ -501,22 +504,22 @@ - + - - - + + + - + - - - + + + - + @@ -554,10 +557,10 @@ - - - - + + + + @@ -595,9 +598,9 @@ - - - + + + @@ -620,11 +623,11 @@ + resource="../../../var/lib/yacy"/> + resource="../var/lib/yacy/SETTINGS"/> + resource="../lib/yacy/LOG"/> @@ -759,35 +762,35 @@ - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -807,7 +810,7 @@ match="yacy \(.*\) unstable; urgency=low" replace="yacy (*auto-git-version*) unstable; urgency=low" /> - + @@ -825,7 +828,7 @@ - + diff --git a/debian/changelog b/debian/changelog index a149b3330..a288a8444 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -yacy (1.2.9018) unstable; urgency=low +yacy (1.922.10016) unstable; urgency=low * SVN Update diff --git a/defaults/web.xml b/defaults/web.xml index 02290d642..9a6fbec39 100644 --- a/defaults/web.xml +++ b/defaults/web.xml @@ -50,12 +50,6 @@ net.yacy.http.servlets.SolrServlet - - - GSAServlet - net.yacy.http.servlets.GSAsearchServlet - - URLProxyServlet @@ -74,11 +68,6 @@ /solr/collection1/select /solr/webgraph/select - - - GSAServlet - /gsa/search - URLProxyServlet diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html index e27c1bb6a..5a0b9dcf8 100644 --- a/htroot/PerformanceMemory_p.html +++ b/htroot/PerformanceMemory_p.html @@ -85,36 +85,7 @@ - - - - - - - - - - - - - - #{SolrList}# - - - - - - - - #{/SolrList}# - - - - - - -
Solr Resources
ClassTypeDescriptionStatisticsSize
#[class]##[type]##[description]##[statistics]##[size]#
Total Cache Count = #[SolrCacheCount]#
- + diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index b5619ecab..37710a4a3 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -28,10 +28,6 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; -import java.util.TreeMap; - -import org.apache.solr.core.SolrInfoMBean; -import org.apache.solr.search.SolrCache; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.RequestHeader; @@ -50,11 +46,9 @@ public class PerformanceMemory_p { private static final long KB = 1024; private static final long MB = 1024 * KB; - + public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) { - // return variable that accumulates replacements - Switchboard sb = (Switchboard) env; - + final serverObjects prop = new serverObjects(); prop.put("gc", "0"); @@ -73,7 +67,7 @@ public class PerformanceMemory_p { MemoryControl.setStandardStrategy(std); } } - + prop.put("simulatedshortmemory.checked", MemoryControl.getSimulatedShortStatus() ? 1 : 0); prop.put("useStandardmemoryStrategy.checked", env.getConfigBool("memory.standardStrategy", true) ? 1 : 0); prop.put("memoryStrategy", MemoryControl.getStrategyName()); @@ -103,37 +97,18 @@ public class PerformanceMemory_p { prop.putNum("memoryUsedAfterInitAGC", (memoryTotalAfterInitAGC - memoryFreeAfterInitAGC) / MB); prop.putNum("memoryUsedNow", MemoryControl.used() / MB); - - final Map solrInfoMBeans = sb.index.fulltext().getSolrInfoBeans(); - final TreeMap> solrBeanOM = new TreeMap>(); - int c = 0; - for (Map.Entry sc: solrInfoMBeans.entrySet()) solrBeanOM.put(sc.getValue().getName() + "$" + sc.getKey() + "$" + c++, sc); - c = 0; - int scc = 0; - for (Map.Entry sc: solrBeanOM.values()) { - prop.put("SolrList_" + c + "_class", sc.getValue().getName()); - prop.put("SolrList_" + c + "_type", sc.getKey()); - prop.put("SolrList_" + c + "_description", sc.getValue().getDescription()); - prop.put("SolrList_" + c + "_statistics", sc.getValue().getStatistics() == null ? "" : sc.getValue().getStatistics().toString().replaceAll(",", ", ")); - prop.put("SolrList_" + c + "_size", sc.getValue() instanceof SolrCache ? Integer.toString(((SolrCache)sc.getValue()).size()) : ""); - if (sc.getValue() instanceof SolrCache) scc++; - c++; - } - prop.put("SolrList", c); - prop.put("SolrCacheCount", scc); - // write table for Table index sizes Iterator i = Table.filenames(); String filename; TableStatistics stats; int p; - c = 0; + int c = 0; long totalmem = 0; while (i.hasNext()) { filename = i.next(); stats = Table.memoryStats(filename); - totalmem += stats.getTotalMem(); - + totalmem += stats.getTotalMem(); + prop.put("EcoList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA",0)) < 0) ? filename : filename.substring(p)); prop.putNum("EcoList_" + c + "_tableSize", stats.getTableSize()); diff --git a/htroot/env/templates/simpleSearchHeader.template b/htroot/env/templates/simpleSearchHeader.template index 91a86b3c3..dcfb2a922 100644 --- a/htroot/env/templates/simpleSearchHeader.template +++ b/htroot/env/templates/simpleSearchHeader.template @@ -50,7 +50,6 @@
  • API   Solr Default Core / JSON
  • API   Solr Default Core / XML
  • API   Solr Webgraph Core / XML
  • -
  • API   Google Appliance API / XML
  • API   Solr Default Core / JSON
  • API   Solr Default Core / XML
  • API   Solr Webgraph Core / XML
  • -
  • API   Google Appliance API / XML
  • Table RAM Index