@@ -1,2 +1,3 @@

 *~

 *.64xfasl

+bundle.jar

new file mode 100644

@@ -0,0 +1,8 @@

+all: bundle.jar jinterface/*.lisp

+

+bundle.jar: generate-bundle/deps.edn

+	clj -Sdeps '{:deps,{uberdeps,{:mvn/version,"0.1.10"}}}' -m uberdeps.uberjar \

+		  --deps-file generate-bundle/deps.edn --target ./bundle.jar

+

+jinterface/*.lisp: generate-ji-definitions.lisp build-ji.lisp bundle.jar

+	lw -build build-ji.lisp

new file mode 100644

@@ -0,0 +1,13 @@

+(require :asdf)

+(require "java-interface")

+

+(mapcar 'asdf:load-asd (directory "*.asd"))

+

+(load "./init.lisp")

+(pushnew :fwoar.gen *features*)

+

+(load "~/quicklisp/setup.lisp")

+(asdf:load-system :fwoar-lisputils)

+

+(load "packages.lisp")

+(load "generate-ji-definitions.lisp")

new file mode 100644

@@ -0,0 +1,3 @@

+{:deps {org.apache.curator/curator-recipes {:mvn/version "RELEASE",

+                                            :exclusions [org.apache.zookeeper/zookeeper]},

+        org.apache.zookeeper/zookeeper {:mvn/version "3.4.13"}}}

@@ -47,7 +47,7 @@

      :name 'fwoar.lw-curator.ji.al::class

      :dest "al.lisp")))

-#+(or)

+#+fwoar.gen

 (progn

   (run)

   (ql:quickload :lw-curator))

@@ -1,6 +1,5 @@

-(in-package :fwoar.lw-curator)

-(serapeum:eval-always

+(eval-when (:compile-toplevel :load-toplevel :execute)

   (unless (lw-ji:get-java-virtual-machine)

     (lw-ji:init-java-interface

      :jvm-library-path "/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/lib/server/libjvm.dylib"

-     :java-class-path (namestring (truename "~/curator-test/bundle.jar")))))

+     :java-class-path (namestring (asdf:system-relative-pathname :lw-curator "bundle" :type "jar")))))

@@ -53,9 +53,9 @@

 (lw-ji:define-java-constructor .new

                                "java.util.ArrayList"

                                :signatures

-                               ("java.util.ArrayList()"

-                                "java.util.ArrayList(java.util.Collection)"

-                                "java.util.ArrayList(int)")

+                               ("java.util.ArrayList(int)"

+                                "java.util.ArrayList()"

+                                "java.util.ArrayList(java.util.Collection)")

                                :class-symbol

                                nil)

 (lw-ji:define-java-caller .contains

@@ -234,8 +234,8 @@

                           "java/util/ArrayList"

                           "listIterator"

                           :signatures

-                          ("public java.util.ListIterator listIterator(int)"

-                           "public java.util.ListIterator listIterator()"))

+                          ("public java.util.ListIterator listIterator()"

+                           "public java.util.ListIterator listIterator(int)"))

 (lw-ji:define-java-caller .sort

                           "java/util/ArrayList"

                           "sort"

@@ -17,8 +17,8 @@

                                   ".POSTSAFENOTIFY"

                                   ".DELETE"

                                   ".RUNSAFE"

-                                  ".INTRANSACTION"

                                   ".GETCHILDREN"

+                                  ".INTRANSACTION"

                                   ".CLEARWATCHERREFERENCES"

                                   ".CLOSE"

                                   ".CREATE"

@@ -98,16 +98,16 @@

                           "runSafe"

                           :signatures

                           ("public abstract java.util.concurrent.CompletableFuture runSafe(java.lang.Runnable)"))

-(lw-ji:define-java-caller .intransaction

-                          "org/apache/curator/framework/CuratorFramework"

-                          "inTransaction"

-                          :signatures

-                          ("public abstract org.apache.curator.framework.api.transaction.CuratorTransaction inTransaction()"))

 (lw-ji:define-java-caller .getchildren

                           "org/apache/curator/framework/CuratorFramework"

                           "getChildren"

                           :signatures

                           ("public abstract org.apache.curator.framework.api.GetChildrenBuilder getChildren()"))

+(lw-ji:define-java-caller .intransaction

+                          "org/apache/curator/framework/CuratorFramework"

+                          "inTransaction"

+                          :signatures

+                          ("public abstract org.apache.curator.framework.api.transaction.CuratorTransaction inTransaction()"))

 (lw-ji:define-java-caller .clearwatcherreferences

                           "org/apache/curator/framework/CuratorFramework"

                           "clearWatcherReferences"

@@ -8,6 +8,7 @@

     :depends-on (#:alexandria

                  #:uiop

                  #:serapeum

+                 #:data-lens

                  #:fwoar-lisputils

                  (:require "java-interface"))

     :serial t

@@ -6,3 +6,28 @@

 (defpackage :fwoar.lw-curator

   (:use :cl )

   (:export ))

+

+(defpackage :fwoar.lw-curator.ji.framework

+  (:use :cl)

+  (:shadow #:class)

+  (:export #:class))

+(defpackage :fwoar.lw-curator.ji.cff

+  (:use :cl)

+  (:shadow #:class)

+  (:export #:class))

+(defpackage :fwoar.lw-curator.ji.bebr

+  (:use :cl)

+  (:shadow #:class)

+  (:export #:class))

+(defpackage :fwoar.lw-curator.ji.gcb

+  (:use :cl)

+  (:shadow #:class)

+  (:export #:class))

+(defpackage :fwoar.lw-curator.ji.gdb

+  (:use :cl)

+  (:shadow #:class)

+  (:export #:class))

+(defpackage :fwoar.lw-curator.ji.al

+  (:use :cl)

+  (:shadow #:class)

+  (:export #:class))