commit 772b46af75656429a1b719396218f6daa518cabe
author Stuart McCulloch <mcculls@apache.org> Tue Feb 05 15:19:11 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Tue Feb 05 15:19:11 2008 +0000
tree 4a99230cea1443017c52793bcedb498200aefb8d
parent 364beaebc413fae369e6bc7700678ec60b90283f

Code cleanup

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

maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java

diff --git a/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java b/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java
index 98faa9b..4ac5fdc 100644
--- a/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java
+++ b/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java
@@ -75,21 +75,21 @@
      * @required
      * @readonly
      */
-    private ArtifactRepository m_localRepo;
+    private ArtifactRepository localRepository;
 
 
     public void execute()
     {
-        // If no OBR repository, return
         if ( "NONE".equalsIgnoreCase( obrRepository ) )
         {
+            getLog().info( "OBR clean disabled (enable with -DobrRepository)" );
             return;
         }
 
         try
         {
             // Compute local repository location
-            URI repositoryXml = ObrUtils.findRepositoryXml( m_localRepo.getBasedir(), obrRepository );
+            URI repositoryXml = ObrUtils.findRepositoryXml( localRepository.getBasedir(), obrRepository );
             if ( !"file".equals( repositoryXml.getScheme() ) )
             {
                 getLog().error( "The repository URI " + repositoryXml + " is not a local file" );
@@ -105,6 +105,8 @@
                 return;
             }
 
+            getLog().info( "Cleaning..." );
+
             Document doc = parseFile( repositoryFile, initConstructor() );
             Node finalDocument = cleanDocument( doc.getDocumentElement() ); // Analyze existing repository.
 
@@ -114,14 +116,13 @@
             }
             else
             {
-                getLog().info( "Cleaning..." );
                 writeToFile( repositoryXml, finalDocument ); // Write the new file
-                getLog().info( "Repository " + repositoryFile + " updated" );
+                getLog().info( "Repository " + repositoryFile + " cleaned" );
             }
         }
         catch ( Exception e )
         {
-            getLog().error( "Exception while cleaning the OBR repository file : " + e.getLocalizedMessage(), e );
+            getLog().error( "Exception while cleaning local OBR: " + e.getLocalizedMessage(), e );
         }
     }
 
@@ -134,7 +135,7 @@
      */
     private Element cleanDocument( Element elem )
     {
-        String localRepoPath = m_localRepo.getBasedir();
+        String localRepoPath = localRepository.getBasedir();
         NodeList nodes = elem.getElementsByTagName( "resource" );
         List toRemove = new ArrayList();