[armedbear-cvs] r13860 - trunk/abcl/contrib/abcl-asdf

[mevenson at common-lisp.net]

Author: mevenson
Date: Mon Feb  6 10:20:21 2012
New Revision: 13860

Log:
ABCL-ASDF:RESOLVE-ARTIFACT now returns the namestring of the artifact.

This aligns the function to the underlying Maven Aether API.  As far
as I can tell, nothing was using RESOLVE-ARTIFACT anyways.

Modified:
   trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd
   trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd	Mon Feb  6 10:20:20 2012	(r13859)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd	Mon Feb  6 10:20:21 2012	(r13860)
@@ -3,7 +3,7 @@
 
 (defsystem :abcl-asdf
   :author "Mark Evenson"
-  :version "0.6.0"
+  :version "0.7.0"
   :depends-on (jss)
   :components 
   ((:module packages :pathname "" 

Modified: trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Mon Feb  6 10:20:20 2012	(r13859)
+++ trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp	Mon Feb  6 10:20:21 2012	(r13860)
@@ -211,7 +211,7 @@
   "A string containing the URI of an http proxy for Maven to use.")
 
 (defun make-proxy ()
-  "Return an org.sonatype.aether.repository.Proxy instance initialized form *MAVEN-HTTP-PROXY*."
+  "Return an org.sonatype.aether.repository.Proxy instance initialized from *MAVEN-HTTP-PROXY*."
   (unless *maven-http-proxy*
     (warn "No proxy specified in *MAVEN-HTTP-PROXY*")
     (return-from make-proxy nil))
@@ -255,7 +255,7 @@
 
 ;;; TODO change this to work on artifact strings like log4j:log4j:jar:1.2.16
 (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.
+  "Resolve artifact to location on the local filesystem.
 
 Declared dependencies are not attempted to be located.
 
@@ -272,7 +272,9 @@
           (java:jnew "org.sonatype.aether.resolution.ArtifactRequest")))
     (#"setArtifact" artifact-request artifact)
     (#"addRepository" artifact-request (ensure-remote-repository))
-    (#"toString" (#"resolveArtifact" (ensure-repository-system) (ensure-session) artifact-request))))
+    (#"toString" (#"getFile" 
+                  (#"getArtifact" (#"resolveArtifact" (ensure-repository-system) 
+                                                      (ensure-session) artifact-request))))))
 
 (defun make-remote-repository (id type url) 
   (jss:new 'aether.repository.RemoteRepository id type url))