Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: markhibberd/foil
base: 87e44af4b5
...
head fork: markhibberd/foil
compare: 781aa999f0
  • 2 commits
  • 20 files changed
  • 0 commit comments
  • 1 contributor
View
12 Makefile
@@ -1,5 +1,5 @@
MODULE = foil
-VERSION = 1.0
+VERSION = 1.1
GEN = gen
@@ -17,10 +17,6 @@ CP_TEST = ${CP_PROD}:${CLS_TEST}
DOC_PROD = ${GEN}/doc/prod
-XRAY = lib/compile/sxr_2.8.0-0.2.7-SNAPSHOT.jar
-XRAY_PROD = ${CLS_PROD}.sxr
-XRAY_DEMO = ${CLS_DEMO}.sxr
-
ETC = etc
DIST = ${GEN}/dist
WWW = ${ETC}/www
@@ -54,9 +50,9 @@ DIRECTORIES = ${GEN} ${GEN}/tmp ${CLS_DEMO} ${CLS_PROD} ${CLS_TEST} ${DIST} ${TA
default: test dist
compile: clean ${CLS_PROD} ${CLS_TEST} ${CLS_DEMO}
- find ${SRC_PROD} -name "*.scala" -o -name "*.java" | xargs -s 30000 scalac -Xplugin:${XRAY} -P:sxr:base-directory:${SRC_PROD} -classpath ${CP_BASE} -d ${CLS_PROD}
+ find ${SRC_PROD} -name "*.scala" -o -name "*.java" | xargs -s 30000 scalac -classpath ${CP_BASE} -d ${CLS_PROD}
find ${SRC_PROD} -name "*.java" | xargs -s 30000 javac -source 1.5 -target 1.5 -classpath ${CP_PROD} -d ${CLS_PROD}
- find ${SRC_DEMO} -name "*.scala" -o -name "*.java" | xargs -s 30000 scalac -Xplugin:${XRAY} -P:sxr:base-directory:${SRC_DEMO} -classpath ${CP_PROD} -d ${CLS_DEMO}
+ find ${SRC_DEMO} -name "*.scala" -o -name "*.java" | xargs -s 30000 scalac -classpath ${CP_PROD} -d ${CLS_DEMO}
find ${SRC_DEMO} -name "*.java" | xargs -s 30000 javac -source 1.5 -target 1.5 -classpath ${CP_PROD} -d ${CLS_DEMO}
find ${SRC_TEST} -name "*.scala" | xargs -s 30000 scalac -classpath ${CP_PROD} -d ${CLS_TEST}
@@ -72,8 +68,6 @@ ${JAR_SRC}: ${DIST}
${TAR}: doc ${JAR} ${JAR_SRC} ${TAR_IMAGE} ${TAR_IMAGE}/lib ${TAR_IMAGE}/doc/xray ${DEMO_TARGET}
cp -r ${DOC_PROD} ${TAR_IMAGE}/doc/api && \
cp -r ${SRC_DEMO} ${TAR_IMAGE}/. && \
- cp -r ${XRAY_PROD} ${TAR_IMAGE}/doc/xray/prod && \
- cp -r ${XRAY_DEMO} ${TAR_IMAGE}/doc/xray/demo && \
cp lib/run/*.jar ${TAR_IMAGE}/lib && \
cp ${JAR} ${JAR_SRC} ${TAR_IMAGE} && \
cp README LICENSE ${TAR_IMAGE} && \
View
10 etc/sha1
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if type sha1 > /dev/null; then
+ sha1 -q "$@"
+elif type sha1sum > /dev/null; then
+ sha1sum "$@" | awk '{print $0}'
+else
+ echo "could not create a sha1" >&2
+ exit 1
+fi
View
113 etc/www/index-1.0.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>foil.mth.io</title>
+ <meta name="author" content="Mark Hibberd" />
+ <link rel="stylesheet" href="http://mth.io/css/reset.css" type="text/css" />
+ <link rel="stylesheet" href="http://mth.io/css/text.css" type="text/css" />
+<link href="http://fonts.googleapis.com/css?family=Droid+Sans:regular,italic,bold,bolditalic" media="screen" rel="stylesheet" type="text/css">
+<link href="http://fonts.googleapis.com/css?family=Droid+Sans+Mono" media="screen" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" href="http://mth.io/css/site.css" type="text/css" />
+ <style media="screen" type="text/css">
+ h1 {
+ font-size: 3em;
+ }
+ h2 {
+ font-size: 2em;
+ }
+
+ </style>
+</head>
+<body>
+
+<div class="site" id="site">
+ <div class="title" id="header">
+ <span id="headertight"><a href="/"><span class="main">foil</span> @ <span class="main">mth</span> <span class="alt">i/o</span></a></span>
+ </div>
+
+ <div id="outerguts">
+ <div id="guts">
+ <h1>foil</h1>
+ <div onclick='document.location="/release/1.0/foil-1.0.tar.gz"; return false;' class="linked"
+ style="-moz-border-radius: 15px;
+ -webkit-border-bottom: 15px;
+ padding: 25px;
+ margin: 30px;
+ border: 4px solid #000;
+ background: #2C77C1;
+ color: #fff;
+ font-size: 3em;
+ float: right;
+ ">
+ Version 1.0
+ </div>
+ <p>
+ Foil is a java http server wrapper, primarily for development and easy set-up.
+ </p>
+
+ <h2>quick start</h2>
+
+ <p>
+ T.B.D.
+ </p>
+
+ <h2>release</h2>
+
+ <p>
+ The current released version is 1.0.
+ </p>
+
+ <ul>
+ <li><a href="/release/1.0/foil-1.0.tar.gz">foil-1.0.tar.gz</a> <a href="/release/1.0/foil-1.0.tar.gz.sha1">[sha1]</a></li>
+ <li><a href="/release/1.0/foil-1.0.zip">foil-1.0.zip</a> <a href="/release/1.0/foil-1.0.zip.sha1">[sha1]</a></li>
+ <li><a href="/release/1.0/foil.jar">foil.jar</a> <a href="/release/1.0/foil.jar.sha1">[sha1]</a></li>
+ <li><a href="/release/1.0/foil-src.jar">foil-src.jar</a> <a href="/release/1.0/foil-src.jar.sha1">[sha1]</a></li>
+ <li><a href="/release/1.0/doc/api">api scaladoc</a> </li>
+ <li><a href="/release/1.0/doc/xray/prod">xray source</a> </li>
+ <li><a href="/release/1.0/doc/xray/demo">xray demo</a> </li>
+ </ul>
+
+
+ <h2>code</h2>
+
+ <p>
+ Grab the code from the mirror at <a href="https://github.com/markhibberd/foil">https://github.com/markhibberd/foil</a>.
+ </p>
+
+ <h2>license</h2>
+
+ <p>
+ The code is free to use under the terms of a <a href="https://github.com/markhibberd/foil/master/LICENSE">3 point BSD license</a>
+ </p>
+
+ <h2>contact</h2>
+
+ <p>
+ Feel free to contact me <a href="mailto:mark@hibberd.id.au">mark@hibberd.id.au</a> or
+ <a href="http://twitter.com/markhibberd/">@markhibberd</a>.
+ </p>
+
+ </div>
+ <div style="padding-bottom: 50px;"></div>
+
+ </div>
+
+ <div id="rest">
+ <div id="footlinks">
+
+ <a href="http://mth.io"/>mth.io</a>
+ </div>
+ <div id="license">
+ <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/80x15.png" /></a>
+ </div>
+ </div>
+
+</div>
+
+
+
+</body>
+</html>
View
125 etc/www/index-1.1.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>foil.mth.io</title>
+ <meta name="author" content="Mark Hibberd" />
+ <link rel="stylesheet" href="http://mth.io/css/reset.css" type="text/css" />
+ <link rel="stylesheet" href="http://mth.io/css/text.css" type="text/css" />
+<link href="http://fonts.googleapis.com/css?family=Droid+Sans:regular,italic,bold,bolditalic" media="screen" rel="stylesheet" type="text/css">
+<link href="http://fonts.googleapis.com/css?family=Droid+Sans+Mono" media="screen" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" href="http://mth.io/css/site.css" type="text/css" />
+ <style media="screen" type="text/css">
+ h1 {
+ font-size: 3em;
+ }
+ h2 {
+ font-size: 2em;
+ }
+
+ </style>
+</head>
+<body>
+
+<div class="site" id="site">
+ <div class="title" id="header">
+ <span id="headertight"><a href="/"><span class="main">foil</span> @ <span class="main">mth</span> <span class="alt">i/o</span></a></span>
+ </div>
+
+ <div id="outerguts">
+ <div id="guts">
+ <h1>foil</h1>
+ <div onclick='document.location="/release/1.1/foil-1.1.tar.gz"; return false;' class="linked"
+ style="-moz-border-radius: 15px;
+ -webkit-border-bottom: 15px;
+ padding: 25px;
+ margin: 30px;
+ border: 4px solid #000;
+ background: #2C77C1;
+ color: #fff;
+ font-size: 3em;
+ float: right;
+ ">
+ Version 1.1
+ </div>
+ <p>
+ Foil is a java http server wrapper, primarily for development and easy set-up.
+ </p>
+
+ <h2>quick start - scala</h2>
+
+ <p>
+ The scala api consists of a numner of data types to build up a configuration,
+ then a server, and then the server can be started. The following is an example
+ of the scala api:
+ </p>
+
+ <script src="https://gist.github.com/1034177.js?file=config.scala"></script>
+
+
+ <h2>quick start - java</h2>
+
+ <p>
+ The java api is a thin wrapper around the scala api. The matching java example:
+ </p>
+
+ <script src="https://gist.github.com/1034177.js?file=JavaDemo.java"></script>
+
+
+ <h2>release</h2>
+
+ <p>
+ The current released version is 1.1 (Built with 2.9.1, see <a href="index-1.0.html">version 1.0</a> for 2.8.x support).
+ </p>
+
+ <ul>
+ <li><a href="/release/1.1/foil-1.1.tar.gz">foil-1.1.tar.gz</a> <a href="/release/1.1/foil-1.1.tar.gz.sha1">[sha1]</a></li>
+ <li><a href="/release/1.1/foil-1.1.zip">foil-1.1.zip</a> <a href="/release/1.1/foil-1.1.zip.sha1">[sha1]</a></li>
+ <li><a href="/release/1.1/foil.jar">foil.jar</a> <a href="/release/1.1/foil.jar.sha1">[sha1]</a></li>
+ <li><a href="/release/1.1/foil-src.jar">foil-src.jar</a> <a href="/release/1.1/foil-src.jar.sha1">[sha1]</a></li>
+ <li><a href="/release/1.1/doc/api">api scaladoc</a> </li>
+ </ul>
+
+
+ <h2>code</h2>
+
+ <p>
+ Grab the code from the mirror at <a href="https://github.com/markhibberd/foil">https://github.com/markhibberd/foil</a>.
+ </p>
+
+ <h2>license</h2>
+
+ <p>
+ The code is free to use under the terms of a <a href="https://github.com/markhibberd/foil/master/LICENSE">3 point BSD license</a>
+ </p>
+
+ <h2>contact</h2>
+
+ <p>
+ Feel free to contact me <a href="mailto:mark@hibberd.id.au">mark@hibberd.id.au</a> or
+ <a href="http://twitter.com/markhibberd/">@markhibberd</a>.
+ </p>
+
+ </div>
+ <div style="padding-bottom: 50px;"></div>
+
+ </div>
+
+ <div id="rest">
+ <div id="footlinks">
+
+ <a href="http://mth.io"/>mth.io</a>
+ </div>
+ <div id="license">
+ <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/80x15.png" /></a>
+ </div>
+ </div>
+
+</div>
+
+
+
+</body>
+</html>
View
113 etc/www/index.html
@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
-<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>foil.mth.io</title>
- <meta name="author" content="Mark Hibberd" />
- <link rel="stylesheet" href="http://mth.io/css/reset.css" type="text/css" />
- <link rel="stylesheet" href="http://mth.io/css/text.css" type="text/css" />
-<link href="http://fonts.googleapis.com/css?family=Droid+Sans:regular,italic,bold,bolditalic" media="screen" rel="stylesheet" type="text/css">
-<link href="http://fonts.googleapis.com/css?family=Droid+Sans+Mono" media="screen" rel="stylesheet" type="text/css">
- <link rel="stylesheet" href="http://mth.io/css/site.css" type="text/css" />
- <style media="screen" type="text/css">
- h1 {
- font-size: 3em;
- }
- h2 {
- font-size: 2em;
- }
-
- </style>
-</head>
-<body>
-
-<div class="site" id="site">
- <div class="title" id="header">
- <span id="headertight"><a href="/"><span class="main">foil</span> @ <span class="main">mth</span> <span class="alt">i/o</span></a></span>
- </div>
-
- <div id="outerguts">
- <div id="guts">
- <h1>foil</h1>
- <div onclick='document.location="/release/1.0/foil-1.0.tar.gz"; return false;' class="linked"
- style="-moz-border-radius: 15px;
- -webkit-border-bottom: 15px;
- padding: 25px;
- margin: 30px;
- border: 4px solid #000;
- background: #2C77C1;
- color: #fff;
- font-size: 3em;
- float: right;
- ">
- Version 1.0
- </div>
- <p>
- Foil is a java http server wrapper, primarily for development and easy set-up.
- </p>
-
- <h2>quick start</h2>
-
- <p>
- T.B.D.
- </p>
-
- <h2>release</h2>
-
- <p>
- The current released version is 1.0.
- </p>
-
- <ul>
- <li><a href="/release/1.0/foil-1.0.tar.gz">foil-1.0.tar.gz</a> <a href="/release/1.0/foil-1.0.tar.gz.sha1">[sha1]</a></li>
- <li><a href="/release/1.0/foil-1.0.zip">foil-1.0.zip</a> <a href="/release/1.0/foil-1.0.zip.sha1">[sha1]</a></li>
- <li><a href="/release/1.0/foil.jar">foil.jar</a> <a href="/release/1.0/foil.jar.sha1">[sha1]</a></li>
- <li><a href="/release/1.0/foil-src.jar">foil-src.jar</a> <a href="/release/1.0/foil-src.jar.sha1">[sha1]</a></li>
- <li><a href="/release/1.0/doc/api">api scaladoc</a> </li>
- <li><a href="/release/1.0/doc/xray/prod">xray source</a> </li>
- <li><a href="/release/1.0/doc/xray/demo">xray demo</a> </li>
- </ul>
-
-
- <h2>code</h2>
-
- <p>
- Grab the code from the mirror at <a href="https://github.com/markhibberd/foil">https://github.com/markhibberd/foil</a>.
- </p>
-
- <h2>license</h2>
-
- <p>
- The code is free to use under the terms of a <a href="https://github.com/markhibberd/foil/master/LICENSE">3 point BSD license</a>
- </p>
-
- <h2>contact</h2>
-
- <p>
- Feel free to contact me <a href="mailto:mark@hibberd.id.au">mark@hibberd.id.au</a> or
- <a href="http://twitter.com/markhibberd/">@markhibberd</a>.
- </p>
-
- </div>
- <div style="padding-bottom: 50px;"></div>
-
- </div>
-
- <div id="rest">
- <div id="footlinks">
-
- <a href="http://mth.io"/>mth.io</a>
- </div>
- <div id="license">
- <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/80x15.png" /></a>
- </div>
- </div>
-
-</div>
-
-
-
-</body>
-</html>
View
1  etc/www/index.html
View
BIN  lib/compile/scala-compiler.jar
Binary file not shown
View
BIN  lib/compile/sxr_2.8.0-0.2.7-SNAPSHOT.jar
Binary file not shown
View
BIN  lib/run/scala-compiler.jar
Binary file not shown
View
BIN  lib/run/scala-library.jar
Binary file not shown
View
BIN  lib/run/scalaz-core_2.8.1-6.0-sources.jar
Binary file not shown
View
BIN  lib/run/scalaz-core_2.8.1-6.0.jar
Binary file not shown
View
BIN  lib/run/scalaz-core_2.9.1-6.0.3-sources.jar
Binary file not shown
View
BIN  lib/run/scalaz-core_2.9.1-6.0.3.jar
Binary file not shown
View
BIN  lib/test/scalacheck_2.8.0-1.7.jar
Binary file not shown
View
BIN  lib/test/scalacheck_2.9.0-1.9-sources.jar
Binary file not shown
View
BIN  lib/test/scalacheck_2.9.0-1.9.jar
Binary file not shown
View
BIN  lib/test/scalatest-1.2.jar
Binary file not shown
View
BIN  lib/test/scalatest_2.9.1-1.6.1-sources.jar
Binary file not shown
View
BIN  lib/test/scalatest_2.9.1-1.6.1.jar
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.