Dolda2000 GitWeb / jsvc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60ef288)
Removed the primitive test code.
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Oct 2009 04:51:14 +0000 (06:51 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Oct 2009 04:51:22 +0000 (06:51 +0200)
build.xml patch | blob | blame | history
etc/test.jsvc.properties [deleted file] patch | blob | blame | history
src/dolda/jsvc/test/Bootstrap.java [deleted file] patch | blob | blame | history
src/dolda/jsvc/test/TestResponder.java [deleted file] patch | blob | blame | history
src/dolda/jsvc/test/static/foo/a [deleted file] patch | blob | blame | history
src/dolda/jsvc/test/static/foo/b [deleted file] patch | blob | blame | history
src/dolda/jsvc/test/static/index.html [deleted file] patch | blob | blame | history
src/dolda/jsvc/test/static/test.css [deleted file] patch | blob | blame | history

diff --git a/build.xml b/build.xml
index b42373a..c51aa71 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,6 @@
    <target name="build-env">
       <mkdir dir="build" />
       <mkdir dir="build/bin" />
-      <mkdir dir="build/test-bin" />
       <mkdir dir="build/api" />
     </target>
 
@@ -36,23 +35,6 @@
       <zip destfile="build/jsvc-api.zip" basedir="build/api" />
     </target>
 
-    <target name="test-war" depends="build-env, jsvc-jar">
-      <taskdef name="jsvc-war" classname="dolda.jsvc.j2ee.Archive$AntTask" classpath="build/jsvc.jar" />
-      <copy todir="build/test-bin/dolda/jsvc/test">
-       <fileset dir="src/dolda/jsvc/test">
-         <include name="static/**" />
-       </fileset>
-      </copy>
-      <copy tofile="build/test-bin/jsvc.properties" file="etc/test.jsvc.properties" />
-      <jar destfile="build/jsvc-test.jar" basedir="build/test-bin" />
-      <jsvc-war destfile="build/jsvc-test.war">
-       <jars dir="build">
-         <include name="jsvc.jar" />
-         <include name="jsvc-test.jar" />
-       </jars>
-      </jsvc-war>
-    </target>
-    
     <target name="clean">
        <delete dir="build" />
     </target>
diff --git a/etc/test.jsvc.properties b/etc/test.jsvc.properties
deleted file mode 100644 (file)
index 2a50054..0000000
--- a/etc/test.jsvc.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-jsvc.j2ee.appname = JSvc Test War
-jsvc.bootstrap = dolda.jsvc.test.Bootstrap
diff --git a/src/dolda/jsvc/test/Bootstrap.java b/src/dolda/jsvc/test/Bootstrap.java
deleted file mode 100644 (file)
index ad4c38f..0000000
--- a/src/dolda/jsvc/test/Bootstrap.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package dolda.jsvc.test;
-
-import dolda.jsvc.*;
-import dolda.jsvc.util.*;
-
-public class Bootstrap {
-    public static Responder responder() {
-       Multiplexer root = new Multiplexer();
-       root.file("test", new TestResponder());
-       root.file("", new StaticContent(Bootstrap.class, "static/index.html", false, "text/html"));
-       root.file("css", new StaticContent(Bootstrap.class, "static/test.css", false, "text/css"));
-       root.dir("foo", new StaticContent(Bootstrap.class, "static/foo", true, "text/plain; charset=utf-8"));
-       return(Misc.stdroot(root));
-    }
-}
diff --git a/src/dolda/jsvc/test/TestResponder.java b/src/dolda/jsvc/test/TestResponder.java
deleted file mode 100644 (file)
index e765d2e..0000000
--- a/src/dolda/jsvc/test/TestResponder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package dolda.jsvc.test;
-
-import dolda.jsvc.*;
-import dolda.jsvc.util.*;
-import java.io.*;
-
-public class TestResponder extends SimpleWriter {
-    public TestResponder() {
-       super("plain");
-    }
-    
-    public void respond(Request req, PrintWriter out) {
-       out.println(req.url());
-       out.println(req.path());
-       out.println(req.inheaders());
-       out.println(req.ctx().starttime());
-       out.println(req.remoteaddr() + "<->" + req.localaddr());
-    }
-}
diff --git a/src/dolda/jsvc/test/static/foo/a b/src/dolda/jsvc/test/static/foo/a
deleted file mode 100644 (file)
index 6e1f517..0000000
--- a/src/dolda/jsvc/test/static/foo/a
+++ /dev/null
@@ -1 +0,0 @@
-Test A
diff --git a/src/dolda/jsvc/test/static/foo/b b/src/dolda/jsvc/test/static/foo/b
deleted file mode 100644 (file)
index d4e395a..0000000
--- a/src/dolda/jsvc/test/static/foo/b
+++ /dev/null
@@ -1 +0,0 @@
-Test B
diff --git a/src/dolda/jsvc/test/static/index.html b/src/dolda/jsvc/test/static/index.html
deleted file mode 100644 (file)
index 8553fc9..0000000
--- a/src/dolda/jsvc/test/static/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
-<head>
-<title>Test</title>
-<link rel="stylesheet" title="Default style" type="text/css" href="css" />
-</head>
-<body>
-<h1>Hello world!</h1>
-<p>Test</p>
-</body>
-</html>
diff --git a/src/dolda/jsvc/test/static/test.css b/src/dolda/jsvc/test/static/test.css
deleted file mode 100644 (file)
index eb67f25..0000000
--- a/src/dolda/jsvc/test/static/test.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-    font-family: sans;
-}
A usable Java HTTP servlet container, unlike J2EE.