commit 92e3bad3809b2ca84264acaba461df6565d2d135
author Stuart McCulloch <mcculls@apache.org> Sat Aug 02 17:30:28 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Sat Aug 02 17:30:28 2008 +0000
tree 1e3c7dc9286b29d07e2035c1bf24d0a89eca49e8
parent 9a14ae1a65a8bc8709d0e9f7dd40cb4982d265d6

FELIX-553: revert to use -DprefixURL=http://... to specify repository prefix, inline with other changes for 1.4.2

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@682021 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
index 26f8487..7bfd93c 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
@@ -82,6 +82,13 @@
     private boolean ignoreLock;
     
     /**
+     * Public URL prefix for the remote repository.
+     *
+     * @parameter expression="${prefixURL}"
+     */
+    private String prefixURL;
+
+    /**
      * Remote OBR Repository.
      * 
      * @parameter expression="${remoteOBR}" default-value="NONE"
@@ -172,6 +179,10 @@
 
         RemoteFileManager remoteFile = new RemoteFileManager( m_wagonManager, settings, log );
         openRepositoryConnection( remoteFile );
+        if ( null == prefixURL || prefixURL.trim().length() == 0 )
+        {
+            prefixURL = remoteFile.toString();
+        }
 
         // ======== LOCK REMOTE OBR ========
         log.info( "LOCK " + remoteFile + '/' + repositoryName );
@@ -191,7 +202,7 @@
 
             // Clean the downloaded file.
             Document doc = parseFile(new File(repositoryXml), initConstructor());
-            Node finalDocument = cleanDocument(tempURI, doc.getDocumentElement());
+            Node finalDocument = cleanDocument(doc.getDocumentElement());
             
             if ( finalDocument == null )
             {
@@ -262,7 +273,7 @@
      * @param elem : the input XML tree
      * @return the cleaned XML tree
      */
-    private Element cleanDocument( URI prefix, Element elem )
+    private Element cleanDocument( Element elem )
     {
         NodeList nodes = elem.getElementsByTagName( "resource" );
         List toRemove = new ArrayList();
@@ -275,7 +286,7 @@
 
             URL url;
             try {
-                url = new URL(prefix.toURL(), value);
+                url = new URL(prefixURL + '/' + value);
             } catch (MalformedURLException e) {
                 getLog().error("Malformed URL when creating the resource absolute URI : " + e.getMessage());
                 return null;