moved all servlets from htroot/xml to htroot/api

the file server contains a patch that temporary matches all xml paths to api,
that means all interfaces still work. Please adopt all your interfaces to the new path.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5497 6c8d7289-2bf4-0310-a012-ef5d649a1542

.classpath

@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="env/|htdocsdefault/|proxymsg/|yacy/|env/|yacy/user/|yacy/user/|yacy/ui/|processing/domaingraph/applet/|processing/domaingraph/|api/" kind="src" path="htroot"/>
+	<classpathentry excluding="env/|htdocsdefault/|proxymsg/|yacy/|env/|yacy/user/|yacy/user/|yacy/ui/|processing/domaingraph/applet/|processing/domaingraph/|api/|api/bookmarks/posts/|api/bookmarks/|api/util/|api/bookmarks/xbel/|api/bookmarks/tags/" kind="src" path="htroot"/>
 	<classpathentry excluding="user/|user/|ui/" kind="src" path="htroot/yacy"/>
 	<classpathentry kind="src" path="htroot/env"/>
 	<classpathentry kind="src" path="source"/>
 	<classpathentry kind="src" path="htroot/yacy/ui"/>
-	<classpathentry kind="src" path="htroot/api"/>
+	<classpathentry excluding="bookmarks/posts/|bookmarks/|util/|bookmarks/xbel/|bookmarks/tags/" kind="src" path="htroot/api"/>
+	<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
+	<classpathentry excluding="posts/|xbel/|tags/" kind="src" path="htroot/api/bookmarks"/>
+	<classpathentry kind="src" path="htroot/api/util"/>
+	<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
+	<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/tar.jar"/>
 	<classpathentry kind="lib" path="libx/bzip2.jar"/>

htroot/WatchCrawler_p.java

@@ -36,7 +36,6 @@ import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import xml.queues_p;
 import de.anomic.crawler.CrawlEntry;
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.SitemapImporter;

htroot/api/blacklists.java

@@ -1,24 +1,4 @@
-// /xml/blacklists.java
-// -------------------------------
-// based on /xml/blacklists_p.java (C) 2006 Alexander Schier, changes by Marc Nause
-// part of YaCy
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
 
-
-package xml;
 import java.io.File;
 import java.util.List;
 

htroot/api/blacklists_p.java

@@ -1,24 +1,4 @@
-// /xml/blacklists_p.java
-// -------------------------------
-// (C) 2006 Alexander Schier, changes by Marc Nause
-// part of YaCy
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
 
-
-package xml;
 import java.io.File;
 import java.util.List;
 

htroot/api/bookmarks/get_bookmarks.java

@@ -1,23 +1,4 @@
-// /xml/bookmarks/get_bookmarks.java
-// -------------------------------
-// (C) 2009 Stefan Förster (apfelmaennchen)
-// part of yacy
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-package xml.bookmarks;
 
 import java.util.Date;
 import java.util.Iterator;

htroot/api/bookmarks/posts/add_p.java

@@ -1,28 +1,4 @@
-// /xml/bookmarks/posts/add_p.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-//
-// last major change: 16.09.2008
-// this file is contributed by Stefan Förster
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-package xml.bookmarks.posts;
 import java.util.HashMap;
 import java.util.Set;
 

htroot/api/bookmarks/posts/all.java

@@ -1,31 +1,4 @@
-// /xml/bookmarks/posts/all.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-//
-// last major change: 27.12.2005
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-// You must compile this file with
-// javac -classpath .:../classes IndexCreate_p.java
-// if the shell's current path is HTROOT
-package xml.bookmarks.posts;
 import java.util.Date;
 import java.util.Iterator;
 

htroot/api/bookmarks/posts/delete_p.java

@@ -1,28 +1,4 @@
-// /xml/bookmarks/posts/delete_p.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-//
-// last major change: 05.02.2006
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-package xml.bookmarks.posts;
 import java.net.MalformedURLException;
 
 import de.anomic.http.httpRequestHeader;

htroot/api/bookmarks/posts/get.java

@@ -1,23 +1,4 @@
-// /xml/bookmarks/posts/all.java
-// -------------------------------
-// (C) 2006 Alexander Schier
-// part of yacy
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-package xml.bookmarks.posts;
 
 import java.text.ParseException;
 import java.util.ArrayList;

htroot/api/bookmarks/tags/getTag.java

@@ -1,33 +1,4 @@
-// /xml.bookmarks/tags/get.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-//
-// last major change: 27.12.2005
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-// You must compile this file with
-// javac -classpath .:../classes IndexCreate_p.java
-// if the shell's current path is HTROOT
-
-//package xml.bookmarks.tags;
-package xml.bookmarks.tags;
 import java.util.Iterator;
 
 import de.anomic.data.bookmarksDB;
@@ -37,7 +8,7 @@ import de.anomic.plasma.plasmaSwitchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 
-public class get {
+public class getTag {
 	final static int SORT_ALPHA = 1;
 	final static int SORT_SIZE = 2;
 	final static int SHOW_ALL = -1;

htroot/api/bookmarks/tags/rename_p.java

@@ -0,0 +1,22 @@
+
+import de.anomic.http.httpRequestHeader;
+import de.anomic.plasma.plasmaSwitchboard;
+import de.anomic.server.serverObjects;
+import de.anomic.server.serverSwitch;
+
+public class rename_p {
+    public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
+        // return variable that accumulates replacements
+        final plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
+        final serverObjects prop = new serverObjects();
+        prop.put("result", "0");//error
+        //rename tags
+        if(post != null && post.containsKey("old") && post.containsKey("new")){
+            if(switchboard.bookmarksDB.renameTag(post.get("old"), post.get("new")))
+                prop.put("result", "1");//success
+        }
+        // return rewrite properties
+        return prop;
+    }
+    
+}

htroot/api/bookmarks/xbel/xbel.java

@@ -1,4 +1,4 @@
-package xml.bookmarks.xbel;
+
 
 import java.util.Date;
 import java.util.Iterator;

htroot/api/config_p.java

@@ -1,27 +1,4 @@
-// /xml/config_p.java
-// -------------------------------
-// (C) 2006 Alexander Schier
-// part of YaCy
-//
-// last major change: 06.02.2006
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
 
-
-package xml;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;

htroot/api/feed.java

@@ -1,30 +1,4 @@
-// feed.java
-// (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
-// first published 25.04.2008 on http://yacy.net
-// 
-// This is a part of YaCy, a peer-to-peer based web search engine
-//
-// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
-// $LastChangedRevision: 1986 $
-// $LastChangedBy: orbiter $
-//
-// LICENSE
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-package xml;
 
 import java.util.Date;
 

htroot/api/queues_p.java

@@ -1,32 +1,4 @@
-// /xml.queues/indexing_p.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-// last major change: 28.10.2005
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-// You must compile this file with
-// javac -classpath .:../classes IndexCreate_p.java
-// if the shell's current path is HTROOT
-
-//package xml.queues;
-package xml;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

htroot/api/status_p.java

@@ -1,25 +1,4 @@
-// /xml.queues/status_p.java
-// -------------------------------
-// part of the yacy
-//
-// (C) 2006 Alexander Schier
-// last major change: 03.11.2006
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation, Inc., 
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-package xml;
 
 import de.anomic.http.httpRequestHeader;
 import de.anomic.http.httpdByteCountInputStream;

htroot/api/util/getpageinfo_p.java

@@ -1,31 +1,4 @@
-// /xml/util/gettitle_p.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-//
-// last major change: 29.12.2005
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-// You must compile this file with
-// javac -classpath .:../classes IndexCreate_p.java
-// if the shell's current path is HTROOT
-package xml.util;
 import java.io.IOException;
 import java.io.Writer;
 import java.net.MalformedURLException;

htroot/api/util/ynetSearch.java

@@ -1,29 +1,4 @@
-///xml/util/ynetSearch.java
+
-//(C) 2008 by Stefan Foerster; sof@gmx.de, Hamburg, Germany
-//first published 15.05.2008 on http://yacy.net
-//
-//This is a part of YaCy, a peer-to-peer based web search engine
-//
-//$LastChangedDate: 2008-05-16 00:44:07 +0200 (Fr, 16 May 2008) $
-//$LastChangedRevision: 4806 $
-//$LastChangedBy: apfelmaennchen $
-//
-//LICENSE
-//
-//This program is free software; you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation; either version 2 of the License, or
-//(at your option) any later version.
-//
-//This program is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//GNU General Public License for more details.
-//
-//You should have received a copy of the GNU General Public License
-//along with this program; if not, write to the Free Software
-//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-package xml.util;
 
 import java.io.IOException;
 import java.io.InputStream;

htroot/api/version.java

@@ -0,0 +1,23 @@
+
+
+import de.anomic.http.httpRequestHeader;
+import de.anomic.server.serverObjects;
+import de.anomic.server.serverSwitch;
+
+public class version {
+
+    public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
+        // return variable that accumulates replacements
+        final serverObjects prop = new serverObjects();
+        
+        prop.put("version", env.getConfig("version", "0.0"));
+        prop.put("svnRev", env.getConfig("svnRevision", "0"));
+        prop.put("buildDate", env.getConfig("vdate", "19700101"));
+        // return rewrite properties
+        return prop;
+    }
+    
+}
+
+
+

htroot/api/webstructure.java

@@ -1,32 +1,5 @@
-// webstructure.java
-// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
-// first published 22.05.2007 on http://yacy.net
-//
-// This is a part of YaCy, a peer-to-peer based web search engine
-//
-// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
-// $LastChangedRevision: 1986 $
-// $LastChangedBy: orbiter $
-//
-// LICENSE
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-package xml;
-
 import java.util.Iterator;
 import java.util.Map;
 

htroot/xml/bookmarks/tags/rename_p.java

@@ -1,50 +0,0 @@
-// /xml.bookmarks/tags/rename_p.java
-// -------------------------------
-// part of the AnomicHTTPD caching proxy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://www.anomic.de
-// Frankfurt, Germany, 2004, 2005
-// last major change: 28.12.2005
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-// You must compile this file with
-// javac -classpath .:../classes IndexCreate_p.java
-// if the shell's current path is HTROOT
-
-//package xml.bookmarks.tags;
-package xml.bookmarks.tags;
-import de.anomic.http.httpRequestHeader;
-import de.anomic.plasma.plasmaSwitchboard;
-import de.anomic.server.serverObjects;
-import de.anomic.server.serverSwitch;
-
-public class rename_p {
-    public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
-        // return variable that accumulates replacements
-        final plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
-        final serverObjects prop = new serverObjects();
-        prop.put("result", "0");//error
-        //rename tags
-        if(post != null && post.containsKey("old") && post.containsKey("new")){
-            if(switchboard.bookmarksDB.renameTag(post.get("old"), post.get("new")))
-                prop.put("result", "1");//success
-        }
-        // return rewrite properties
-        return prop;
-    }
-    
-}

htroot/xml/version.java

@@ -1,45 +0,0 @@
-// /xml/version.java
-// -------------------------------
-// (C) 2006 Alexander Schier
-// part of YaCy
-//
-// last major change: 06.02.2006
-// this file is contributed by Alexander Schier
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
-
-package xml;
-
-import de.anomic.http.httpRequestHeader;
-import de.anomic.server.serverObjects;
-import de.anomic.server.serverSwitch;
-
-public class version {
-
-    public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch<?> env) {
-        // return variable that accumulates replacements
-        final serverObjects prop = new serverObjects();
-        
-        prop.put("version", env.getConfig("version", "0.0"));
-        prop.put("svnRev", env.getConfig("svnRevision", "0"));
-        prop.put("buildDate", env.getConfig("vdate", "19700101"));
-        // return rewrite properties
-        return prop;
-    }
-    
-}
-
-
-

source/de/anomic/http/httpdFileHandler.java

@@ -296,13 +296,16 @@ public final class httpdFileHandler {
             if (authorization != null && authorization.length() == 0) authorization = null;
             final String adminAccountBase64MD5 = switchboard.getConfig(httpd.ADMIN_ACCOUNT_B64MD5, "");
             
-            int pos = path.lastIndexOf(".");
+            // a bad patch to map the /xml/ path to /api/
-            
+            if (path.startsWith("/xml/")) {
+                path = "/api/" + path.substring(5);
+            }
+
             final boolean adminAccountForLocalhost = sb.getConfigBool("adminAccountForLocalhost", false);
             final String refererHost = requestHeader.refererHost();
             final boolean accessFromLocalhost = serverCore.isLocalhost(clientIP) && (refererHost.length() == 0 || serverCore.isLocalhost(refererHost));
             final boolean grantedForLocalhost = adminAccountForLocalhost && accessFromLocalhost;
-            final boolean protectedPage = (path.substring(0,(pos==-1)?path.length():pos)).endsWith("_p");
+            final boolean protectedPage = path.indexOf("_p.") > 0;
             final boolean accountEmpty = adminAccountBase64MD5.length() == 0;
             
             if (!grantedForLocalhost && protectedPage && !accountEmpty) {
@@ -946,14 +949,14 @@ public final class httpdFileHandler {
                         if (targetMd5File.exists()) {
                             //String description = null;
                             targetMD5 = new String(serverFileUtils.read(targetMd5File));
-                            pos = targetMD5.indexOf('\n');
+                            int pos = targetMD5.indexOf('\n');
-                           if (pos >= 0) {
+                            if (pos >= 0) {
-                               //description = targetMD5.substring(pos + 1);
+                                //description = targetMD5.substring(pos + 1);
-                               targetMD5 = targetMD5.substring(0, pos);
+                                targetMD5 = targetMD5.substring(0, pos);
-                           }         
+                            }
-                           
+
-                           // using the checksum as ETAG header
+                            // using the checksum as ETAG header
-                           header.put(httpHeader.ETAG, targetMD5);
+                            header.put(httpHeader.ETAG, targetMD5);
                         }
                     } catch (final IOException e) {
                         e.printStackTrace();