changed name of def-page to define-endpoint

3 files changed, 18 insertions, 17 deletions

diff --git a/webapps/ldapadmin/clojurescript/ldapadmin/.gitignore b/webapps/ldapadmin/clojurescript/ldapadmin/.gitignore
index 21dfdd2..c754477 100644
--- a/webapps/ldapadmin/clojurescript/ldapadmin/.gitignore
+++ b/webapps/ldapadmin/clojurescript/ldapadmin/.gitignore
@@ -1,5 +1,6 @@
 target
 classes
+resources
 checkouts
 pom.xml
 pom.xml.asc
diff --git a/webapps/ldapadmin/site.lisp b/webapps/ldapadmin/site.lisp
index 00d91c5..f636759 100644
--- a/webapps/ldapadmin/site.lisp
+++ b/webapps/ldapadmin/site.lisp
@@ -79,19 +79,19 @@
 
 ;; ========================================================================== ;;
 
-(def-page :get "/" () .base)
-(def-page :get "/location" () .location)
-(def-page :get "/home" () .home)
-(def-page :get "/menu" () .menu)
-(def-page :get "/login" () .login)
-(def-page :post "/login/authenticate" ((dn :parameter-type 'string) (password :parameter-type 'string)) .login-authenticate)
-(def-page :get "/logout" () .logout)
-(def-page :get "/inetorg/view" () .inetorg-view)
-(def-page :get "/inetorg/view/search" () .inetorg-view-search)
-(def-page :post "/inetorg/view/results" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string)) .inetorg-view-results)
-(def-page :post "/inetorg/modify" ((cn :parameter-type 'string)) .inetorg-modify)
-(def-page :post "/inetorg/modify/submit" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string)) .inetorg-modify-submit)
-(def-page :post "/inetorg/delete" ((cn :parameter-type 'string)) .inetorg-delete)
-(def-page :post "/inetorg/delete/submit" ((cn :parameter-type 'string)) .inetorg-delete-submit)
-(def-page :get "/inetorg/add" () .inetorg-add)
-(def-page :post "/inetorg/add/submit" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string)) .inetorg-add-submit)
+(define-endpoint :get "/" () .base)
+(define-endpoint :get "/location" () .location)
+(define-endpoint :get "/home" () .home)
+(define-endpoint :get "/menu" () .menu)
+(define-endpoint :get "/login" () .login)
+(define-endpoint :post "/login/authenticate" ((dn :parameter-type 'string) (password :parameter-type 'string)) .login-authenticate)
+(define-endpoint :get "/logout" () .logout)
+(define-endpoint :get "/inetorg/view" () .inetorg-view)
+(define-endpoint :get "/inetorg/view/search" () .inetorg-view-search)
+(define-endpoint :post "/inetorg/view/results" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string)) .inetorg-view-results)
+(define-endpoint :post "/inetorg/modify" ((cn :parameter-type 'string)) .inetorg-modify)
+(define-endpoint :post "/inetorg/modify/submit" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string)) .inetorg-modify-submit)
+(define-endpoint :post "/inetorg/delete" ((cn :parameter-type 'string)) .inetorg-delete)
+(define-endpoint :post "/inetorg/delete/submit" ((cn :parameter-type 'string)) .inetorg-delete-submit)
+(define-endpoint :get "/inetorg/add" () .inetorg-add)
+(define-endpoint :post "/inetorg/add/submit" ((givenname :parameter-type 'string) (sn :parameter-type 'string) (mail :parameter-type 'string) (postaladdress :parameter-type 'string) (postalcode :parameter-type 'string) (st :parameter-type 'string) (l :parameter-type 'string) (telephonenumber :parameter-type 'string) (mobile :parameter-type 'string)) .inetorg-add-submit)
diff --git a/webapps/webapp-loader.lisp b/webapps/webapp-loader.lisp
index de5bf81..c29da1f 100644
--- a/webapps/webapp-loader.lisp
+++ b/webapps/webapp-loader.lisp
@@ -152,7 +152,7 @@ overwritten with the new one."
   
 ;; ========================================================================== ;;
 
-(defmacro def-page (request-type uri var-list page-function)
+(defmacro define-endpoint (request-type uri var-list page-function)
   "Does the grunt work of creating an `easy-handler' for each page you
 wish to publish."
   (let ((name (gensym)))