From 56fe4494620ac2e7831875733d7ad2ffc1c6b73f Mon Sep 17 00:00:00 2001 From: Zsolt Kovcs Date: Tue, 23 Sep 2014 12:11:08 +0200 Subject: Removing HTTP and UDP servers --- .../java/com/c2kernel/process/ItemHTTPBridge.java | 60 -------- .../c2kernel/utils/server/HTTPRequestHandler.java | 160 --------------------- .../com/c2kernel/utils/server/UDPListener.java | 54 ------- 3 files changed, 274 deletions(-) delete mode 100644 src/main/java/com/c2kernel/process/ItemHTTPBridge.java delete mode 100644 src/main/java/com/c2kernel/utils/server/HTTPRequestHandler.java delete mode 100644 src/main/java/com/c2kernel/utils/server/UDPListener.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/c2kernel/process/ItemHTTPBridge.java b/src/main/java/com/c2kernel/process/ItemHTTPBridge.java deleted file mode 100644 index 8db52f9..0000000 --- a/src/main/java/com/c2kernel/process/ItemHTTPBridge.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.c2kernel.process; - -import java.util.StringTokenizer; - -import com.c2kernel.common.ObjectNotFoundException; -import com.c2kernel.entity.C2KLocalObject; -import com.c2kernel.lookup.DomainPath; -import com.c2kernel.lookup.InvalidItemPathException; -import com.c2kernel.lookup.ItemPath; -import com.c2kernel.utils.server.HTTPRequestHandler; - -/* QueryData over HTTP Socket Handler - * Processes an HTTP request consisting of // - * and returns that kernel object as XML - * Currently supports GET requests. - * REVISIT: POST calls Item.request() - */ - -public class ItemHTTPBridge extends HTTPRequestHandler { - - public ItemHTTPBridge() { } - - @Override - public String getName() { - return "Item HTTP Server"; - } - - @Override - public String processRequest() { - System.out.println("ItemHTTPBridge::ProcessRequest()"); - StringTokenizer tok = new StringTokenizer(resource, "?"); - String path = tok.nextToken(); - String query = tok.nextToken(); - ItemPath itemPath; - try { - itemPath = new ItemPath(path); - } catch (InvalidItemPathException ex) { - DomainPath domPath = new DomainPath(path); - if (!domPath.exists()) - return error("404 Not Found", "The path "+path+" you requested was not found."); - try { - itemPath = domPath.getItemPath(); - } catch (ObjectNotFoundException e) { - return error("404 Not Found", "The path "+path+" you requested was not found."); - } - } - - if (method.equals("GET")) { - try { - C2KLocalObject response = Gateway.getStorage().get(itemPath, query, null); - return Gateway.getMarshaller().marshall(response); - } - catch (Exception e) { - return error("400 Bad Request", "Usage: GET <path to item>?<path to kernel object>
"+e.getClass().getName()); - } - } - return(super.processRequest()); - } - -} diff --git a/src/main/java/com/c2kernel/utils/server/HTTPRequestHandler.java b/src/main/java/com/c2kernel/utils/server/HTTPRequestHandler.java deleted file mode 100644 index 886ae9f..0000000 --- a/src/main/java/com/c2kernel/utils/server/HTTPRequestHandler.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.c2kernel.utils.server; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.Socket; -import java.util.Date; -import java.util.HashMap; -import java.util.NoSuchElementException; -import java.util.StringTokenizer; - -import com.c2kernel.utils.Logger; - -public class HTTPRequestHandler implements SocketHandler { - - protected HashMap headers = new HashMap(); - protected String method; - protected String resource; - protected String version; - protected String returnMIME; - protected String statusCode; - protected String postData; - protected final static String CRLF = "\r\n"; - protected BufferedReader request; - protected Socket currentSocket = null; - - public HTTPRequestHandler() { } - - @Override - public String getName() { - return "HTTP Server"; - } - - @Override - public boolean isBusy() { - return (currentSocket!=null); - } - - @Override - public void setSocket(Socket newSocket) { - currentSocket = newSocket; - } - - @Override - public void shutdown() { - try { - if (currentSocket != null) currentSocket.close(); - } catch (IOException e) { - Logger.error("Error shutting down HTTP connection"); - } - currentSocket = null; - } - - @Override - public void run() { - Thread.currentThread().setName("HTTP Request Handler"); - try { - request = new BufferedReader(new InputStreamReader(currentSocket.getInputStream())); - // parse the request - boolean firstLine = true; - String headerLine; - do { - headerLine = request.readLine(); - if (headerLine == null) - throw new IOException("Disconnected"); - if (firstLine) { // request line - StringTokenizer params = new StringTokenizer(headerLine); - try { - method = params.nextToken(); - resource = params.nextToken(); - version = params.nextToken(); - } catch (NoSuchElementException ex1) { } // incomplete request line - doesn't matter - firstLine = false; - } - else { // headers - int split = headerLine.indexOf(": "); - if (split >= 0) - headers.put( - headerLine.substring(0, split), - headerLine.substring(split+2) - ); - } - } while (!headerLine.equals(CRLF) && !headerLine.equals("")); - - String response = null; - - try { - - if (headers.containsKey("Content-length")) { // read POST data - StringBuffer postBuffer = new StringBuffer(); - int received = 0; int length = Integer.parseInt(headers.get("Content-length")); - try { - while (received < length) { - String postLine = request.readLine(); - postBuffer.append(postLine); - received+=postLine.length(); - } - } catch (IOException ex) { - Logger.error("Error reading post data. "+received+" bytes of "+length+" received. ("+(received*100.0/length)+"%"); - Logger.error(ex); - throw ex; - } - } - // Got the params, generate response - - returnMIME = "text/xml"; - statusCode = "200 OK"; - - response = processRequest(); - } catch (Exception ex3) { - response = error("500 Server Error", ex3.getClass().getName()+"
"+ex3.getMessage()); - } - System.out.println(new Date().toString()+" "+currentSocket.getInetAddress()+" "+method+" "+resource+" "+statusCode); - - OutputStream output = currentSocket.getOutputStream(); - - statusCode = "HTTP/1.0 "+statusCode+CRLF; - output.write(statusCode.getBytes()); - - returnMIME = "Content-type: "+returnMIME+CRLF; - output.write(returnMIME.getBytes()); - - String contentLength = "Content-Length: "+response.length()+CRLF; - output.write(contentLength.getBytes()); - - // Possible: last mod? - // end of headers - output.write(CRLF.getBytes()); - - // write the content - output.write(response.getBytes()); - request.close(); - output.close(); - currentSocket.close(); - } catch (IOException ex2) { - Logger.error(ex2); - } // aborted connection probably - currentSocket = null; - } - - /* This is a dummy method that doesn't support anything. - * Override it. - */ - - public String processRequest() { - return error("501 Not Implemented", "The method "+method+" you have requested is not supported by this server."); - } - - public String error(String code, String desc) { - statusCode = code; - returnMIME = "text/html"; - return ("" + - ""+code+"" + - "

"+code+"

" + - "

"+desc+ - "


Cristal Item HTTP server"); - } -} - diff --git a/src/main/java/com/c2kernel/utils/server/UDPListener.java b/src/main/java/com/c2kernel/utils/server/UDPListener.java deleted file mode 100644 index 3b1fc9d..0000000 --- a/src/main/java/com/c2kernel/utils/server/UDPListener.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.c2kernel.utils.server; - -import java.io.IOException; -import java.io.InterruptedIOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; - -import com.c2kernel.common.InvalidDataException; -import com.c2kernel.utils.Logger; - -/************************************************************************** - * - * $Revision: 1.2 $ - * $Date: 2004/02/06 14:50:43 $ - * - * Copyright (C) 2003 CERN - European Organization for Nuclear Research - * All rights reserved. - **************************************************************************/ - -public abstract class UDPListener extends Thread { - - private boolean active = true; - protected DatagramSocket socket; - - public UDPListener() { - super(); - } - - @Override - public void run() { - Thread.currentThread().setName("UDP Server"); - byte[] buffer = new byte[255]; - DatagramPacket newPacket = new DatagramPacket(buffer, buffer.length); - while (active) { - try { - socket.receive(newPacket); - processPacket(newPacket); - } catch (InterruptedIOException e) { // ignore timeout - } catch (IOException e) { - Logger.error("Error receiving proxy packet:"); - Logger.error(e); - } catch (InvalidDataException e) { - Logger.error(e); - } - } - socket.close(); - } - - protected abstract void processPacket(DatagramPacket packet) throws InvalidDataException; - - public void shutdown() { - active = false; - } -} -- cgit v1.2.3