diff --git a/htroot/DemoServlet.html b/htroot/DemoServlet.html
deleted file mode 100644
index 06ca4174f..000000000
--- a/htroot/DemoServlet.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
- YaCy '#[clientname]#': Demo-Servlet
-
-
-
-
-
-
-
-
- Hello world!
-
-
-
-
-
-
- Your user name: #[username]#
-
-
-
-
A list of all users on this system:
-
- #{users}#
- - #[user]#
- #{/users}#
-
-
-
-
-
- Temperature: #[temperature]#
-
-
-
-
-
-
- #{localimg}#
-
- 
-
- #(checked)#no::yes::maybe#(/checked)#
-
- #{/localimg}#
-
-
-
-
-
-
-
Upload a file (will be stored in HTDOCS/upload/username/):
-
-
- JavaScript example: Permanent storage of value, assigned to logged in user account
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- JavaScript example: Load value from global RDF store
-
-
-
-
-
-
-
-
-
-
- l
-
-
-
-
-
-
- #%env/templates/footer.template%#
-
-
-
-
-
diff --git a/htroot/DemoServletInteraction.java b/htroot/DemoServletInteraction.java
deleted file mode 100644
index 066a1a2c1..000000000
--- a/htroot/DemoServletInteraction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.server.serverObjects;
-import net.yacy.server.serverSwitch;
-
-public final class DemoServletInteraction {
-
- public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header,
- @SuppressWarnings("unused") final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
- // return variable that accumulates replacements
- final serverObjects prop = new serverObjects();
-
- prop.put("temperature", "-10°C");
-
- // return rewrite properties
- return prop;
- }
-
-}
diff --git a/htroot/DemoServletRDF.html b/htroot/DemoServletRDF.html
deleted file mode 100644
index b599c829e..000000000
--- a/htroot/DemoServletRDF.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- YaCy '#[clientname]#': Demo-Servlet
-
-
-
-
-
-
- #%env/templates/metas.template%#
-
-
-
-
-
-
-
- Global RDF content:
-
-
-
-
-
- here comes the rdf data
-
-
-
-
-
-
-
-
diff --git a/htroot/DemoServletRDF.java b/htroot/DemoServletRDF.java
deleted file mode 100644
index e05040a2e..000000000
--- a/htroot/DemoServletRDF.java
+++ /dev/null
@@ -1,46 +0,0 @@
-import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.server.serverObjects;
-import net.yacy.server.serverSwitch;
-
-public final class DemoServletRDF {
-
- public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header,
- final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
- // return variable that accumulates replacements
- final serverObjects prop = new serverObjects();
-
-// prop.put("temperature", "-10°C");
-
- if (post != null) {
-
- if (post.containsKey("submit")) {
- prop.put("temperature", post.get("textthing"));
-
- String filename= post.get("textthing");
-
-// prop.put("imglink", filename+".jpg");
-
- int counter = 0;
-
- while (counter < 10) {
-
- prop.put("localimg_"+counter+"_path","/"+filename);
-
- prop.put("localimg_"+counter+"_checked", "2");
- counter++;
- }
-
- prop.put("localimg", counter);
-
-
-
-// prop.put("temperature",yacy.homedir+"/DATA/HTDOCS/"+filename);
- }
-
- }
-
- // return rewrite properties
- return prop;
- }
-
-}
diff --git a/source/net/yacy/interaction/Interaction.java b/source/net/yacy/interaction/Interaction.java
deleted file mode 100644
index 17e1684fe..000000000
--- a/source/net/yacy/interaction/Interaction.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package net.yacy.interaction;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import net.yacy.cora.document.encoding.UTF8;
-import net.yacy.cora.document.id.DigestURL;
-import net.yacy.cora.protocol.ClientIdentification;
-import net.yacy.cora.protocol.HeaderFramework;
-import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.protocol.http.HTTPClient;
-import net.yacy.cora.util.ConcurrentLog;
-import net.yacy.cora.util.SpaceExceededException;
-import net.yacy.data.UserDB;
-import net.yacy.kelondro.blob.Tables.Row;
-import net.yacy.peers.Seed;
-import net.yacy.search.Switchboard;
-
-import org.apache.http.entity.mime.content.ContentBody;
-
-
-
-public class Interaction {
-
-
- public static String GetLoggedOnUser (RequestHeader requestHeader) {
-
- UserDB.Entry entry = null;
-
- //String result = "anonymous";
-
- entry = Switchboard.getSwitchboard().userDB.proxyAuth((requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx")));
- if(entry != null){
-
- }else{
- entry=Switchboard.getSwitchboard().userDB.cookieAuth(requestHeader.getHeaderCookies());
-
- if(entry == null){
- entry=Switchboard.getSwitchboard().userDB.ipAuth((requestHeader.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "xxxxxx")));
- if(entry != null){
-
- }
- }
- }
-
- //identified via userDB
- if(entry != null){
-
- return entry.getUserName();
-
- }else if(Switchboard.getSwitchboard().verifyAuthentication(requestHeader)){
- return "staticadmin";
- }
-
- return "";
- }
-
-
- public static Set GetUsers() {
-
- Set res = new HashSet();
-
- UserDB.Entry entry = null;
-
- final Iterator it = Switchboard.getSwitchboard().userDB.iterator(true);
-
- while (it.hasNext()) {
- entry = it.next();
- if (entry == null) {
- continue;
- }
- res.add (entry.getUserName());
-
- }
-
- return res;
- }
-
- public static String GetDomain (String url) {
-
- String domain = url;
-
- try {
- DigestURL uri = new DigestURL (url);
-
- domain = uri.getHost();
- } catch (final MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return domain;
-
- }
-
-
-
-
-
- public static String GetURLHash (String url) {
-
- String result = "";
-
- DigestURL uri;
- try {
- uri = new DigestURL (url);
-
- result = UTF8.String(uri.hash());
-
-
-
- } catch (final MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- return result;
-
- }
-
-
-
-
-public static String GetTableentry(String url, String type, String username) {
-
- final Switchboard sb = Switchboard.getSwitchboard();
-
- String retvalue = "";
-
- try {
- Iterator it = sb.tables.iterator(username+"_contribution", "url", url.getBytes());
-
- ConcurrentLog.info ("TABLE", "GET "+username+" / "+url+" - "+type+" ...");
-
- it = sb.tables.orderBy(it, -1, "timestamp_creation").iterator();
-
- while (it.hasNext()) {
- Row r = it.next();
-
- if (r.get("type", "").equals (type)) {
-
- retvalue = r.get("value", "");
- }
-
- }
- } catch (final IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- ConcurrentLog.info ("TABLE", "GET "+username+" / "+url+" - "+type+" - "+retvalue);
-
- return retvalue;
-
-
-}
-
-public static String Tableentry(String url, String type, String comment, String from, String peer) {
-
- final Switchboard sb = Switchboard.getSwitchboard();
-
- if (peer == "") {
- peer = sb.peers.myName();
- }
-
- Boolean processlocal = false;
-
- ConcurrentLog.info ("TABLE", "PUT "+from+" / "+url+" - "+type+" - "+comment);
-
- if (!sb.getConfig("interaction.contribution.accumulationpeer", "").equals("")) {
-
- if (sb.getConfig("interaction.contribution.accumulationpeer", "").equals(sb.peers.myName())) {
-
- // Our peer is meant to process the feedback.
- processlocal = true;
-
- } else {
-
- // Forward feedback to other peer
- ConcurrentLog.info("INTERACTION", "Forwarding contribution to "+sb.getConfig("interaction.contribution.accumulationpeer", "")+": " + url + ": "
- + comment);
- try {
-
- Seed host = sb.peers.lookupByName(sb.getConfig("interaction.contribution.accumulationpeer", ""));
-
- return (UTF8.String(new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent).POSTbytes(
- "http://"+host.getPublicAddress()+"/interaction/Contribution.json"
- + "?url=" + url + "&comment=" + comment
- + "&from=" + from + "&peer=" + peer,
- new HashMap(), false, false)));
- } catch (final IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return "";
- }
- }
- } else {
- // No forward defined
- processlocal = true;
- }
-
- if (processlocal) {
-
- final String date = String.valueOf(System.currentTimeMillis());
-
- final Map map = new HashMap();
-
- map.put("url", url.getBytes());
- map.put("username", from.getBytes());
- map.put("peer", peer.getBytes());
- map.put("status", "new".getBytes());
- map.put("type", type.getBytes());
- map.put("value", comment.getBytes());
- map.put("timestamp_creation", date.getBytes());
-
- try {
- sb.tables.insert(from+"_contribution", map);
- } catch (final IOException e) {
- ConcurrentLog.logException(e);
- } catch (final SpaceExceededException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- return "";
-}
-
-}