Changeset 13836

Timestamp:

01/31/12 17:24:52 (12 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: Enable the specification of an http(s) proxy in ABCL-ASDF:*maven-http-proxy*.

ABCL-ASDF:*MAVEN-VERBOSE* now controls the stream to which the Maven
Aether repository system reports progress in resolving dependencies.
The logging messages could be presented in a perhaps slightly less verbose method.

Refactor the setting of various subsystem in special variables with
associated ENSURE-* methods.

Location:

trunk/abcl/contrib/abcl-asdf

Files:

• maven-embedder.lisp (modified) (6 diffs)
• packages.lisp (modified) (1 diff)

trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

@@ -35 +35 @@
     (unless mvn
       (warn "Failed to find Maven3 libraries.")
-      (return-from find-mvn-libs))
+      (return-from find-mvn-libs nil))
     (truename (make-pathname 
                :defaults (merge-pathnames "../lib/" mvn)
@@ -146 +146 @@
      (#"newLocalRepositoryManager" repository-system local-repository))))
 
+(defparameter *session* nil
+  "Reference to the Maven RepositorySystemSession")
+
+(defparameter *maven-http-proxy* nil
+  "A string containing the URI of an http proxy for Maven to use.")
+
+(defparameter *repository-system* nil)
+
+(defun ensure-repository-system ()
+  (unless *repository-system*
+    (setf *repository-system* (repository-system)))
+  *repository-system*)
+
+(defun make-proxy ()
+  "Return an org.sonatype.aether.repository.Proxy instance initialized form *MAVEN-HTTP-PROXY*."
+  (unless *maven-http-proxy*
+    (warn "No proxy specified in *MAVEN-HTTP-PROXY*")
+    (return-from make-proxy nil))
+  (let* ((p (pathname *maven-http-proxy*))
+         (scheme (sys::url-pathname-scheme p))
+         (authority (sys::url-pathname-authority p))
+         (host (if (search ":" authority)
+                   (subseq authority 0 (search ":" authority))
+                   authority))
+         (port (when (search ":" authority)
+                 (parse-integer (subseq authority (1+ (search ":" authority))))))
+         ;; TODO allow specification of authentication
+         (authentication java:+null+))
+    (jss:new 'org.sonatype.aether.repository.Proxy
+             scheme host port authentication)))
+
+(defun ensure-session ()
+  "Ensure that the RepositorySystemSession has been created.
+
+If *MAVEN-HTTP-PROXY* is non-nil, parse its value as the http proxy."
+  (unless *session*
+    (ensure-repository-system)
+    (setf *session* (new-session *repository-system*))
+    (#"setRepositoryListener" *session* (make-repository-listener))
+    (when *maven-http-proxy*
+      (let ((proxy (make-proxy)))
+        (#"add" (#"getProxySelector" *session*)
+                proxy 
+                ;; A string specifying non proxy hosts, or null
+                java:+null+))))
+    *session*)
+    
+
 (defun resolve-artifact (group-id artifact-id &optional (version "LATEST" versionp))
   "Directly resolve Maven dependencies for item with GROUP-ID and ARTIFACT-ID at VERSION, ignoring dependencies.
@@ -175 +223 @@
     (#"resolveArtifact" system session artifact-request)))
 
+(defparameter *aether-remote-repository* nil) ;;; TODO
+
 (defun resolve-dependencies (group-id artifact-id &optional (version "LATEST" versionp))
   "Dynamically resolve Maven dependencies for item with GROUP-ID and ARTIFACT-ID at VERSION.
@@ -187 +237 @@
   (unless versionp
     (warn "Using LATEST for unspecified version."))
-  (let* ((system 
-          (repository-system))
-         (session 
-          (new-session system))
-         (artifact
+  (let* ;;((system 
+        ;; (repository-system))
+        ;; (session 
+        ;;  (new-session system))
+         ((artifact
           (java:jnew (jss:find-java-class "aether.util.artifact.DefaultArtifact")
                      (format nil "~A:~A:~A"
@@ -203 +253 @@
          (collect-request (java:jnew (jss:find-java-class "CollectRequest"))))
     (#"setRoot" collect-request dependency)
+    (when *maven-http-proxy*
+      (#"setProxy" central (make-proxy)))
     (#"addRepository" collect-request central)
     (let* ((node 
-            (#"getRoot" (#"collectDependencies" system session collect-request)))
+            (#"getRoot" (#"collectDependencies" (ensure-repository-system) (ensure-session) collect-request)))
            (dependency-request 
             (java:jnew (jss:find-java-class "DependencyRequest")
@@ -211 +263 @@
            (nlg 
             (java:jnew (jss:find-java-class "PreorderNodeListGenerator"))))
-      (#"resolveDependencies" system session dependency-request)
+      (#"resolveDependencies" (ensure-repository-system) (ensure-session) dependency-request)
       (#"accept" node nlg)
       (#"getClassPath" nlg))))
 
-
-
+(defparameter *maven-verbose* t
+  "Stream to send output from the Maven Aether subsystem to, or NIL to muffle output")
+
+(defun make-repository-listener ()
+  ;;; XXX why does the (flet ((log (e) ...)) (java:jinterface-implementation ...) version not work?
+  (java:jinterface-implementation 
+   "org.sonatype.aether.RepositoryListener"
+   "artifactDeployed" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactDeploying" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactDescriptorInvalid" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactDescriptorMissing" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactDownloaded" (lambda (e) (format *maven-verbose*  "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "artifactDownloading" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactInstalled" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "artifactInstalling" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactResolved" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "artifactResolving" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "metadataDeployed" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "metadataDeploying" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "metadataDownloaded" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "metadataDownloading" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "metadataInstalled" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "metadataInstalling" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "metadataInvalid" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e))) 
+   "metadataResolved" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))
+   "metadataResolving" (lambda (e) (format *maven-verbose* "~&transfer-listener: ~A~%" (#"toString" e)))))
 
          

trunk/abcl/contrib/abcl-asdf/packages.lisp

@@ -15 +15 @@
 ;;;; Maven 
    #:*mvn-libs-directory*
+   #:*maven-http-proxy*
+   #:*maven-verbose*
 
    #:satisfy