X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/6de8d30004efc9337b8c40d2ff2d0a76651d23eb..4644082451f92f7a060e47be6b9967acf8412c7f:/src/ucw/packages.lisp

diff --git a/src/ucw/packages.lisp b/src/ucw/packages.lisp
dissimilarity index 92%
index 172bff9..4d97207 100644
--- a/src/ucw/packages.lisp
+++ b/src/ucw/packages.lisp
@@ -1,109 +1,22 @@
-
-(defpackage lisp-on-lines-ucw
-  (:documentation "An LoL Layer over ucw.basic")
-  (:nicknames #:lol-ucw)
-  (:use #:lisp-on-lines #:ucw :common-lisp :arnesi :yaclml :puri)
-  (:shadow 
-   #:standard-window-component
-   #:make-action
-   #:standard-action
-   #:uri-parse-error
-   #:standard-application)
-
-  (:shadowing-import-from :ucw
-   #:parent)
-  
-  (:import-from :ucw
-   #:register-action-in-frame
-   #:+action-parameter-name+
-   #:context.current-frame
-   #:uri.query
-   #:*current-component*
-   #:find-action
-   #:service)
-		
-  (:export 
-   ;;; Symbols marked ";*" are not from UCW 
-   ;;; but either shadowed or created for lol. 
-
-   #:defcomponent
-
-   #:uri.query
-   
-   ;; Standard Server
-   #:standard-server
-   #:startup-server
-   #:shutdown-server
-
-
-   ;; Sessions
-   #:get-session-value
-   ;; Standard Application
-   #:standard-application
-   #:register-application
-   #:service
-
-   ;; Standard Request Context
-   #:*context*
-   #:context.current-frame
-   #:context.window-component
-
-
-   ;; Actions
-   #:call
-   #:make-action
-   #:find-action
-   #:defaction
-   #:defmethod/cc
-
-   #:call-component
-   #:answer-component
-
-   ;; Entry Points   
-   #:defentry-point
-
-   ;; Standard Components
-   #:render
-   #:render-html-body
-   #:component
-
-   #:standard-component-class
-   #:described-component-class
-
-   #:container
-   #:find-component
-   
-   #:standard-window-component ;*
-   #:window-body
-
-   ))
-
-(defpackage :lisp-on-lines-tags
-  (:documentation "LoL convience yaclml tags.")
-  (:use)
-  (:nicknames #:<lol)
-  (:export
-   #:component-body
-   #:render-component
-   #:a
-   #:area
-   #:form
-   #:input
-   #:button
-   #:simple-select
-   #:select
-   #:option
-   #:textarea
-
-   #:integer-range-select
-   #:month-day-select
-   #:month-select
-
-   #:text
-   #:password
-   #:submit
-   #:simple-form
-   #:simple-submit
-
-   #:localized
-   #:script))
\ No newline at end of file
+
+(defpackage lisp-on-lines-ucw
+  (:documentation "An LoL Layer over ucw.basic")
+  (:nicknames #:lol-ucw)
+  (:use #:lisp-on-lines #:ucw :ucw-core :common-lisp :arnesi)
+
+  (:shadowing-import-from :js
+   #:new)  
+  (:shadowing-import-from :ucw-core
+   #:parent )
+  (:import-from :ucw-standard 
+	#:call #:answer	#:defaction #:*source-component*)
+  
+
+		
+  (:export 
+
+   ;;; First, LOL-UCW exports. The rest are from UCW.
+   #:lol-component
+   
+   #:described-component-class))
+