Revert "Started building out pedestal framework tests. Was never able to run the test due to 404's on the necessary pages, but the initial structure is there"

This reverts commit 243e7fda0b0c08466941827bcc33b5c951aa4d1f.

pedestal/benchmark_config

@@ -1,46 +0,0 @@
-{
-  "framework": "pedestal",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "json_url": "/pedestal/json",
-      "db_url": "/pedestal/db/1",
-      "query_url": "/pedestal/db/",
-      "fortune_url": "/pedestal/fortune-hiccup",
-      "plaintext_url": "/pedestal/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "pedestal",
-      "language": "Clojure",
-      "orm": "Micro",
-      "platform": "Servlet",
-      "webserver": "Resin",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "pedestal",
-      "notes": "",
-      "versus": "servlet"
-    },
-    "raw": {
-      "setup_file": "setup",
-      "db_url": "/pedestal/dbraw/1",
-      "query_url": "/pedestal/dbraw/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "pedestal",
-      "language": "Clojure",
-      "orm": "Raw",
-      "platform": "Servlet",
-      "webserver": "Resin",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "pedestal-raw",
-      "notes": "",
-      "versus": "servlet"
-    }
-  }]
-}

pedestal/helloworld/.gitignore

@@ -1,3 +0,0 @@
-target/
-tmp/
-logs/

pedestal/helloworld/.lein-repl-history

@@ -1,2 +0,0 @@
-(use 'dev)
-(start)

pedestal/helloworld/README.md

@@ -1,23 +0,0 @@
-# helloworld
-
-FIXME
-
-## Getting Started
-
-1. Start the application: `lein run-dev` \*
-2. Go to [localhost:8080](http://localhost:8080/) to see: `Hello World!`
-3. Read your app's source code at src/helloworld/service.clj. Explore the docs of functions
-   that define routes and responses.
-4. Run your app's tests with `lein test`. Read the tests at test/helloworld/service_test.clj.
-5. Learn more! See the [Links section below](#links).
-
-\* `lein run-dev` automatically detects code changes. Alternatively, you can run in production mode
-with `lein run`.
-
-## Configuration
-
-To configure logging see config/logback.xml. By default, the app logs to stdout and logs/.
-To learn more about configuring Logback, read its [documentation](http://logback.qos.ch/documentation.html).
-
-## Links
-* [Other examples](https://github.com/pedestal/samples)

pedestal/helloworld/config/logback.xml

@@ -1,52 +0,0 @@
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<configuration scan="true" scanPeriod="10 seconds">
-
-  <!-- Simple file output -->
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <!-- rollover daily -->
-      <fileNamePattern>logs/helloworld-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-      <timeBasedFileNamingAndTriggeringPolicy
-          class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-        <!-- or whenever the file size reaches 64 MB -->
-        <maxFileSize>64 MB</maxFileSize>
-      </timeBasedFileNamingAndTriggeringPolicy>
-    </rollingPolicy>
-
-    <!-- Safely log to the same file from multiple JVMs. Degrades performance! -->
-    <prudent>true</prudent>
-  </appender>
-
-
-  <!-- Console output -->
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-    <encoder>
-      <pattern>%-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-    <!-- Only log level INFO and above -->
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>INFO</level>
-    </filter>
-  </appender>
-
-
-  <!-- Enable FILE and STDOUT appenders for all log messages.
-       By default, only log at level INFO and above. -->
-  <root level="INFO">
-    <appender-ref ref="FILE" />
-    <appender-ref ref="STDOUT" />
-  </root>
-
-  <!-- For loggers in the these namespaces, log at all levels. -->
-  <logger name="user" level="ALL" />
-  <!-- To log pedestal internals, enable this and change ThresholdFilter to DEBUG
-    <logger name="io.pedestal" level="ALL" />
-  -->
-
-</configuration>

pedestal/helloworld/config/user.clj

@@ -1 +0,0 @@
-;; Empty file to permit project.clj :repl-options {:init user} to work

pedestal/helloworld/project.clj

@@ -1,29 +0,0 @@
-(defproject helloworld "0.0.1-SNAPSHOT"
-  :description "FIXME: write description"
-  :url "http://example.com/FIXME"
-  :license {:name "Eclipse Public License"
-            :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.5.1"]
-                 [io.pedestal/pedestal.service "0.2.2"]
-                 [io.pedestal/pedestal.service-tools "0.2.2"]
-
-                 ;; Remove this line and uncomment the next line to
-                 ;; use Tomcat instead of Jetty:
-                 [io.pedestal/pedestal.jetty "0.2.2"]
-                 ;; [io.pedestal/pedestal.tomcat "0.2.2"]
-                 ]
-  :min-lein-version "2.0.0"
-  :resource-paths ["config", "resources"]
-  :aliases {"run-dev" ["trampoline" "run" "-m" "helloworld.server/run-dev"]}
-  :repl-options  {:init-ns user
-                  :init (try
-                          (use 'io.pedestal.service-tools.dev)
-                          (require 'helloworld.service)
-                          ;; Nasty trick to get around being unable to reference non-clojure.core symbols in :init
-                          (eval '(init helloworld.service/service #'helloworld.service/routes))
-                          (catch Throwable t
-                            (println "ERROR: There was a problem loading io.pedestal.service-tools.dev")
-                            (clojure.stacktrace/print-stack-trace t)
-                            (println)))
-                  :welcome (println "Welcome to pedestal-service! Run (tools-help) to see a list of useful functions.")}
-  :main ^{:skip-aot true} helloworld.server)

pedestal/helloworld/src/helloworld/handler.clj

@@ -1,154 +0,0 @@
-(ns hello.handler
-  (:import com.mchange.v2.c3p0.ComboPooledDataSource)
-  (:use pedestal.core
-        ring.middleware.json
-        ring.util.response
-        korma.db
-        korma.core
-        hiccup.core
-        hiccup.util)
-  (:require [pedestal.handler :as handler]
-            [pedestal.route :as route]
-            [clojure.java.jdbc :as jdbc]
-            [clojure.java.jdbc.sql :as sql]
-            [net.cgrand.enlive-html :as html]))
-
-; Database connection
-(defdb db (mysql {:subname "//localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
-                  :user "benchmarkdbuser"
-                  :password "benchmarkdbpass"
-                  ;;OPTIONAL KEYS
-                  :delimiters "" ;; remove delimiters
-                  :maximum-pool-size 256
-                  }))
-
-; Set up entity World and the database representation
-(defentity world
-  (pk :id)
-  (table :world)
-  (entity-fields :id :randomNumber)
-  (database db))
-
-; Query a random World record from the database
-(defn get-world []
-  (let [id (inc (rand-int 9999))] ; Num between 1 and 10,000
-    (select world
-            (fields :id :randomNumber)
-            (where {:id id }))))
-
-; Run the specified number of queries, return the results
-(defn run-queries [queries]
-  (vec ; Return as a vector
-   (flatten ; Make it a list of maps
-    (take
-     queries ; Number of queries to run
-     (repeatedly get-world)))))
-
-; Database connection for java.jdbc "raw"
-; https://github.com/clojure/java.jdbc/blob/master/doc/clojure/java/jdbc/ConnectionPooling.md
-(def db-spec-mysql-raw
-  {:classname "com.mysql.jdbc.Driver"
-   :subprotocol "mysql"
-   :subname "//localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
-   :user "benchmarkdbuser"
-   :password "benchmarkdbpass"})
-
-(defn pool
-  [spec]
-  (let [cpds (doto (ComboPooledDataSource.)
-               (.setDriverClass (:classname spec))
-               (.setJdbcUrl (str "jdbc:" (:subprotocol spec) ":" (:subname spec)))
-               (.setUser (:user spec))
-               (.setPassword (:password spec))
-               ;; expire excess connections after 30 minutes of inactivity:
-               (.setMaxIdleTimeExcessConnections (* 30 60))
-               ;; expire connections after 3 hours of inactivity:
-               (.setMaxIdleTime (* 3 60 60)))]
-    {:datasource cpds}))
-
-(def pooled-db (delay (pool db-spec-mysql-raw)))
-
-(defn db-raw [] @pooled-db)
-
-; Query a random World record from the database
-(defn get-world-raw []
-  (let [id (inc (rand-int 9999))] ; Num between 1 and 10,000
-    (jdbc/with-connection (db-raw)
-      (jdbc/with-query-results rs [(str "select * from world where id = ?") id]
-        (doall rs)))))
-
-; Run the specified number of queries, return the results
-(defn run-queries-raw [queries]
-  (vec ; Return as a vector
-   (flatten ; Make it a list of maps
-    (take
-     queries ; Number of queries to run
-     (repeatedly get-world-raw)))))
-
-(defn get-query-count [queries]
-  "Parse provided string value of query count, clamping values to between 1 and 500."
-  (let [q (try (Integer/parseInt queries)
-               (catch Exception e 1))] ; default to 1 on parse failure
-    (if (> q 500)
-      500 ; clamp to 500 max
-      (if (< q 1)
-        1 ; clamp to 1 min
-        q)))) ; otherwise use provided value
-
-
-; Set up entity World and the database representation
-(defentity fortune
-  (pk :id)
-  (table :fortune)
-  (entity-fields :id :message)
-  (database db))
-
-(defn get-all-fortunes []
-  "Query all Fortune records from the database."
-    (select fortune
-            (fields :id :message)))
-
-(defn get-fortunes []
-  "Fetch the full list of Fortunes from the database, sort them by the fortune
-message text, and then return the results."
-  (let [fortunes (conj (get-all-fortunes) {:id 0 :message "Additional fortune added at request time."} )]
-    (sort-by #(:message %) fortunes)))
-
-(defn fortunes-hiccup [fortunes]
-  "Render the given fortunes to simple HTML using Hiccup."
-  (html
-   [:head
-    [:title "Fortunes"]]
-   [:body
-    [:table
-     [:tr
-      [:th "id"]
-      [:th "message"]]
-     (for [x fortunes]
-       [:tr
-        [:td (:id x)]
-        [:td (escape-html (:message x))]])
-     ]]))
-
-(defn fortunes-enlive [fortunes]
-  "Render the given fortunes to simple HTML using Enlive."
-  "todo")
-
-; Define route handlers
-(defroutes app-routes
-  (GET "/" [] "Hello, World!")
-  (GET "/plaintext" []
-       {:status 200
-        :headers {"Content-Type" "text/plain; charset=utf-8"}
-        :body "Hello, World!"})
-  (GET "/json" [] (response {:message "Hello, World!"}))
-  (GET "/db/:queries" [queries] (response (run-queries (get-query-count queries))))
-  (GET "/dbraw/:queries" [queries] (response (run-queries-raw (get-query-count queries))))
-  (GET "/fortune" [] (response (get-fortunes)))
-  (GET "/fortune-hiccup" [] (fortunes-hiccup (get-fortunes)))
-  (GET "/fortune-enlive" [] (fortunes-enlive (get-fortunes)))
-  (route/not-found "Not Found"))
-
-; Format responses as JSON
-(def app
-  (wrap-json-response app-routes))

pedestal/helloworld/src/helloworld/server.clj

@@ -1,39 +0,0 @@
-(ns helloworld.server
-  (:gen-class) ; for -main method in uberjar
-  (:require [io.pedestal.service-tools.server :as server]
-            [helloworld.service :as service]
-            [io.pedestal.service.http :as bootstrap]
-            [io.pedestal.service-tools.dev :as dev]))
-
-(defn create-server
-  "Standalone dev/prod mode."
-  [& [opts]]
-  (alter-var-root #'service-instance
-                  (constantly (bootstrap/create-server (merge service/service opts)))))
-
-(defn run-dev
-  "The entry-point for 'lein run-dev'"
-  [& args]
-  (dev/init service/service #'service/routes)
-  (apply dev/-main args))
-
-;; To implement your own server, copy io.pedestal.service-tools.server and
-;; customize it.
-
-(defn -main
-  "The entry-point for 'lein run'"
-  [& args]
-  (server/init service/service)
-  (apply server/-main args))
-
-;; Fns for use with io.pedestal.servlet.ClojureVarServlet
-
-(defn servlet-init [this config]
-  (server/init service/service)
-  (server/servlet-init this config))
-
-(defn servlet-destroy [this]
-  (server/servlet-destroy this))
-
-(defn servlet-service [this servlet-req servlet-resp]
-  (server/servlet-service this servlet-req servlet-resp))

pedestal/helloworld/src/helloworld/service.clj

@@ -1,29 +0,0 @@
-(ns helloworld.service
-    (:require [io.pedestal.service.http :as bootstrap]
-              [io.pedestal.service.http.route.definition :refer [defroutes]]
-              [ring.util.response :refer [response]]))
-
-(defn home-page
-  [request]
-  (response "Hello World!"))
-
-(defroutes routes
-  [[["/" {:get home-page}
-     ;; Set default interceptors for /about and any other paths under /
-     ^:interceptors [bootstrap/html-body]]]])
-
-;; Consumed by helloworld.server/create-server
-;; See bootstrap/default-interceptors for additional options you can configure
-(def service {:env :prod
-              ;; You can bring your own non-default interceptors. Make
-              ;; sure you include routing and set it up right for
-              ;; dev-mode. If you do, many other keys for configuring
-              ;; default interceptors will be ignored.
-              ;; :bootstrap/interceptors []
-              ::bootstrap/routes routes
-
-              ;; Either :jetty or :tomcat (see comments in project.clj
-              ;; to enable Tomcat)
-              ;;::bootstrap/host "localhost"
-              ::bootstrap/type :jetty
-              ::bootstrap/port 8080})

pedestal/helloworld/test/helloworld/service_test.clj

@@ -1,24 +0,0 @@
-(ns helloworld.service-test
-  (:require [clojure.test :refer :all]
-            [io.pedestal.service.test :refer :all]
-            [io.pedestal.service.http :as bootstrap]
-            [helloworld.service :as service]))
-
-(def service
-  (::bootstrap/service-fn (bootstrap/create-servlet service/service)))
-
-(deftest home-page-test
-  (is (=
-       (:body (response-for service :get "/"))
-       "Hello World!"))
-  (is (=
-       (:headers (response-for service :get "/"))
-       {"Content-Type" "text/html;charset=UTF-8"})))
-
-(deftest about-page-test
-  (is (.contains
-       (:body (response-for service :get "/about"))
-       "Clojure 1.5"))
-  (is (=
-       (:headers (response-for service :get "/about"))
-       {"Content-Type" "text/html;charset=UTF-8"})))

pedestal/lein

@@ -1,139 +0,0 @@
-#!/bin/bash
-
-# This variant of the lein script is meant for downstream packagers.
-# It has all the cross-platform stuff stripped out as well as the
-# logic for running from checkouts and self-upgrading.
-
-echo "You're running the proper lein!"
-
-export LEIN_VERSION="1.7.1"
-
-if [ `whoami` = "root" ] && [ "$LEIN_ROOT" = "" ]; then
-    echo "WARNING: You're currently running as root; probably by accident."
-    echo "Press control-C to abort or Enter to continue as root."
-    echo "Set LEIN_ROOT to disable this warning."
-    read _
-fi
-
-# cd to the project root, if applicable
-NOT_FOUND=1
-ORIGINAL_PWD="$PWD"
-while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]; do
-    cd ..
-    if [ "$(dirname "$PWD")" = "/" ]; then
-        NOT_FOUND=0
-        cd "$ORIGINAL_PWD"
-    fi
-done
-
-# Support $JAVA_OPTS for backwards-compatibility.
-export JAVA_CMD=${JAVA_CMD:-"java"}
-export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
-export LEIN_JAVA_CMD=${LEIN_JAVA_CMD:-$JAVA_CMD}
-export LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"$JVM_OPTS"}"
-
-if [ "$LEIN_HOME" = "" ]; then
-  if [ -d "$PWD/.lein" ] && [ "$PWD" != "$HOME" ]; then
-    echo "Leiningen is running in bundled mode."
-    export LEIN_HOME="$PWD/.lein"
-  else
-    export LEIN_HOME="$HOME/.lein"
-  fi
-fi
-
-DEV_PLUGINS="$(ls -1 lib/dev/*jar .lein-plugins/*jar 2> /dev/null)"
-USER_PLUGINS="$(ls -1 "$LEIN_HOME"/plugins/*jar 2> /dev/null)"
-
-artifact_name () {
-    echo "$1" | sed -e "s/.*\/\(.*\)/\1/" | \
-        rev | sed -e "s/raj[-[:digit:].]*-\(.*\)/\1/" | rev
-}
-
-unique_user_plugins () {
-    saveIFS="$IFS"
-    IFS="$(printf '\n\t')"
-
-    plugins="$(echo "$DEV_PLUGINS"; echo "$USER_PLUGINS")"
-    artifacts="$(for i in $plugins; do echo "$(artifact_name "$i")"; done)"
-    duplicates="$(echo "$artifacts" | sort | uniq -d)"
-
-    if [ -z "$duplicates" ]; then
-        echo "$USER_PLUGINS"
-    else
-        for i in $USER_PLUGINS; do
-            artifact="$(artifact_name "$i")"
-            if ! echo "$duplicates" | grep -xq "$artifact"; then
-                echo "$i"
-            fi
-        done
-    fi
-    IFS="$saveIFS"
-}
-
-LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
-LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
-CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
-
-# apply context specific CLASSPATH entries
-if [ -f .lein-classpath ]; then
-    CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
-fi
-
-SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
-lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
-maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
-maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
-plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
-xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
-backport-util-concurrent" # NFI why that last one is necessary
-for JAR in $SHARE_JARS; do
-    CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
-done
-
-# Do not use installed leiningen jar during self-compilation
-if ! { [ "$1" = "compile" ] &&
-        grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
-            project.clj ;}; then
-    CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
-fi
-
-if [ $DEBUG ]; then
-    echo $CLASSPATH
-    echo $CLOJURE_JAR
-fi
-
-# Use rlwrap if appropriate
-if ([ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]); then
-    which rlwrap > /dev/null
-    if [ $? -eq 0 ]; then
-        RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars
-    fi
-    RLWRAP_CLJ_WORDS_FILE=${RLWRAP_CLJ_WORDS_FILE:-"${HOME}/.clj_completions"}
-    RLWRAP_CLJ_WORDS_OPTION=""
-    if [ -r "${RLWRAP_CLJ_WORDS_FILE}" ]; then
-        RLWRAP_CLJ_WORDS_OPTION="-f ${RLWRAP_CLJ_WORDS_FILE}";
-    fi
-    RLWRAP="${RLWRAP} $RLWRAP_OPTIONS -b \"(){}[],^%$#@\";:'\" ${RLWRAP_CLJ_WORDS_OPTION}"
-fi
-
-TRAMPOLINE_FILE="/tmp/lein-trampoline-$$"
-
-$RLWRAP $LEIN_JAVA_CMD \
-    -Xbootclasspath/a:"$CLOJURE_JAR" \
-    -client $LEIN_JVM_OPTS \
-    -XX:+TieredCompilation \
-    -Dleiningen.original.pwd="$ORIGINAL_PWD" \
-    -Dleiningen.trampoline-file=$TRAMPOLINE_FILE \
-    -cp "$CLASSPATH" \
-    clojure.main -e "(use 'leiningen.core)(-main)" /dev/null "$@"
-
-EXIT_CODE=$?
-
-if [ -r $TRAMPOLINE_FILE ]; then
-    TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
-    rm $TRAMPOLINE_FILE
-    exec sh -c "exec $TRAMPOLINE"
-else
-    exit $EXIT_CODE
-fi

pedestal/setup.py

@@ -1,22 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-
-def start(args):
-  setup_util.replace_text("pedestal/helloworld/project.clj", ":subname \"//.*:3306", ":subname \"//" + args.database_host + ":3306")
-
-  try:
-    subprocess.check_call("lein ring uberwar", shell=True, cwd="pedestal/helloworld")
-    subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
-    subprocess.check_call("cp pedestal/helloworld/target/helloworld-pedestal-standalone.war $RESIN_HOME/webapps/pedestal.war", shell=True)
-    subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-def stop():
-  try:
-    subprocess.check_call("$RESIN_HOME/bin/resinctl shutdown", shell=True)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1