Changeset 14259

Timestamp:

11/28/12 11:06:03 (8 years ago)

Author:

Mark Evenson

Message:

abcl-asdf: restore the ability to use maven-3.0.3

Warn when interpreting alias for "com.sun.jna:jna".

Closes #268.

Location:

trunk/abcl/contrib

Files:

• README.markdown (modified) (2 diffs)
• abcl-asdf/README.markdown (modified) (2 diffs)
• abcl-asdf/abcl-asdf.asd (modified) (1 diff)
• abcl-asdf/maven-embedder.lisp (modified) (5 diffs)

trunk/abcl/contrib/README.markdown

@@ -39 +39 @@
    
 A collection of various useful JVM artifacts downloaded and cached by
-the Aether Maven connector.  Requires the maven-3.0.4 executable "mvn"
+the Aether Maven connector.  Requires the maven-3.0.3 executable "mvn"
 (or "mvn.bat" under MSFT Windows) to be in the current processes's path.
     
@@ -65 +65 @@
 Mark <evenson.not.org@gmail.com>
 Created:  2011-09-11
-Revised:  2012-10-12
+Revised:  2012-11-28
 
 

trunk/abcl/contrib/abcl-asdf/README.markdown

@@ -160 +160 @@
 [1]:  http://www.iris-reasoner.org/
 
-Releases
---------
-
-### 9.9.2 2012-11-09
-
-
-
-
-### 0.7.0 2012-02-05
-
-Plausibly work under MSFT operating systems.
-
-Working with maven-3.0.4.
-
-### 0.5.0 2012-01-22
-
-   o  just bless this as a release to stablize its offered API "as is"
-   
-   o  definitely failing under MSFT
-   
-   o  ASDF version has to be a three value integer (i.e. no "-snapshot"
-      after version).  Should be fixed with appropiate :AROUND method
-      as implementation specific monkeypatch.
-       
-
-### 0.4.1 2011-09-06 
-
-    o  locating the proper Maven3 libraries could work in more places
-   
-    o  untested under Windows
-   
-    o  more information should be optionally available when downloading
-       as this process can potentially take a long time.
-
-
 #### Colophon
 
@@ -200 +165 @@
     
     Created: 2011-01-01
-    Revised: 2012-11-09
+    Revised: 2012-11-28
     

trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

@@ -3 +3 @@
 (asdf:defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "0.9.2"
+  :version "1.0.0"
   :depends-on (jss)
   :components 

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

@@ -145 +145 @@
      (and (>= major 3)
           (>= minor 0)
-          (>= patch 4)))))
+          (>= patch 3)))))
 
 (defparameter *init* nil)
@@ -155 +155 @@
   (unless (and *mvn-libs-directory*
                (probe-file *mvn-libs-directory*))
-   (error "You must download maven-3.0.4 or later from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
+   (error "Please obtain and install maven-3.0.4 locally from http://maven.apache.org/download.html, then set ABCL-ASDF:*MVN-DIRECTORY* appropiately."))
  (unless (ensure-mvn-version)
-   (error "We need maven-3.0.4 or later."))  (add-directory-jars-to-class-path *mvn-libs-directory* nil)
+   (error "We need maven-3.0.3 or later."))  (add-directory-jars-to-class-path *mvn-libs-directory* nil)
   (setf *init* t))
 
-(defparameter *http-wagon-implementations*
-  ;;; maven-3.0.3 reported as not working with all needed functionality
-  `("org.apache.maven.wagon.providers.http.HttpWagon" ;; introduced as default with maven-3.0.4
-    "org.apache.maven.wagon.providers.http.LightweightHttpWagon")
-  "A list of possible candidate implementations that provide access to http and https resources.
-
-Supposedly configurable with the java.net.protocols (c.f. reference maso2000 in the Manual.)")
+(defun find-http-wagon ()
+  "Find an implementation of the object that provides access to http and https resources.
+
+Supposedly configurable with the java.net.protocols (c.f. reference
+maso2000 in the Manual.)"
+  (handler-case 
+      ;; maven-3.0.4
+      (java:jnew "org.apache.maven.wagon.providers.http.HttpWagon") 
+    (error () 
+      ;; maven-3.0.3 reported as not working with all needed functionality
+      (java:jnew  "org.apache.maven.wagon.providers.http.LightweightHttpWagon"))))
 
 (defun make-wagon-provider ()
@@ -180 +184 @@
      (cond 
        ((find role-hint '("http" "https") :test #'string-equal)
-        (some (lambda (provider) (java:jnew provider)) *http-wagon-implementations*))
+        (find-http-wagon))
        (t
         (progn 
@@ -190 +194 @@
      (declare (ignore wagon)))))
 
+(defun find-service-locator ()
+  (handler-case 
+      (java:jnew "org.apache.maven.repository.internal.MavenServiceLocator") ;; maven-3.0.4
+    (error () 
+      (java:jnew "org.apache.maven.repository.internal.DefaultServiceLocator"))))
+
 (defun make-repository-system ()
   (unless *init* (init))
   (let ((locator 
-         (java:jnew "org.apache.maven.repository.internal.MavenServiceLocator"))
+         (find-service-locator))
         (wagon-provider-class 
          (java:jclass "org.sonatype.aether.connector.wagon.WagonProvider"))
@@ -416 +426 @@
     (cond 
       ((= (length result) 3)
-       (resolve-dependencies (first result) (second result) (third result)))
+       (resolve-dependencies 
+        (first result) (second result) (third result)))
       ((string= string "com.sun.jna:jna")
-       (resolve-dependencies "net.java.dev.jna" "jna" "3.4.0"))
+       (warn "Replacing request for no longer available com.sun.jna:jna with net.java.dev.jna:jna")
+       (resolve-dependencies "net.java.dev.jna" "jna" "LATEST"))
       (t
        (apply #'resolve-dependencies result)))))
   
-#+nil
-(defmethod resolve ((mvn asdf:mvn))
-  (with-slots (asdf::group-id asdf::artifact-id asdf::version)
-      (asdf:ensure-parsed-mvn mvn)
-    (resolve-dependencies (format nil "~A:~A:~A" asdf::group-id asdf::artifact-id asdf::version))))
-
 ;;; Currently the last file listed in ASDF
 (provide 'abcl-asdf)