svn commit: r579737 - in /felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin: ObrUpdate.java ResourcesBundle.java

[mc...@apache.org]

Author: mcculls
Date: Wed Sep 26 11:01:28 2007
New Revision: 579737

URL: http://svn.apache.org/viewvc?rev=579737&view=rev
Log:
Switched some warnings over to debug, as they always occur when installing a bundle created using the bundle plugin and the log message is confusing (it doesn't tell the user if/why they should be concerned about this issue - in fact I can't really tell why it's a warning). Also tweaked a couple of info messages to give the user better feedback.

Modified:
    felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ObrUpdate.java
    felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ResourcesBundle.java

Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ObrUpdate.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ObrUpdate.java?rev=579737&r1=579736&r2=579737&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ObrUpdate.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ObrUpdate.java Wed Sep 26 11:01:28 2007
@@ -230,6 +230,7 @@
         }
 
         // the repository.xml file have been modified, so we save it
+        m_logger.info("Writing OBR metadata");
         writeToFile(m_repoFilename, m_root);
     }
 
@@ -264,7 +265,7 @@
             try {
 
             	fout.createNewFile();
-                m_logger.info("Created new repository.xml file in "+fout.getAbsolutePath());
+                m_logger.info("Created "+fout.getAbsolutePath());
             } catch (IOException e) {
                 m_logger.error("Cannot create file " + fout.getAbsolutePath());
                 e.printStackTrace();
@@ -304,7 +305,7 @@
     private Document parseFile(String filename, DocumentBuilder constructor) {
         if (constructor == null) { return null; }
         // The document is the root of the DOM tree.
-        m_logger.info("Try to open: " + filename);
+        m_logger.info("Parsing " + filename);
         Document doc = null;
         try {
             doc = constructor.parse(new File(filename));

Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ResourcesBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ResourcesBundle.java?rev=579737&r1=579736&r2=579737&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ResourcesBundle.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/sandbox/obr/plugin/ResourcesBundle.java Wed Sep 26 11:01:28 2007
@@ -314,42 +314,42 @@
 
         if (ebi.getPresentationName() != null) {
             this.setPresentationName(ebi.getPresentationName());
-            if (project.getName() != null) { m_logger.warn("pom property override:<presentationname> " + project.getName()); }
+            if (project.getName() != null) { m_logger.debug("pom property override:<presentationname> " + project.getName()); }
         } else {
             this.setPresentationName(project.getName());
         }
 
         if (ebi.getSymbolicName() != null) {
             this.setSymbolicName(ebi.getSymbolicName());
-            if (project.getArtifactId() != null) { m_logger.warn("pom property override:<symbolicname> " + project.getArtifactId()); }
+            if (project.getArtifactId() != null) { m_logger.debug("pom property override:<symbolicname> " + project.getArtifactId()); }
         } else {
             this.setSymbolicName(project.getArtifactId());
         }
 
         if (ebi.getVersion() != null) {
             this.setVersion(ebi.getVersion());
-            if (project.getVersion() != null) { m_logger.warn("pom property override:<version> " + project.getVersion()); }
+            if (project.getVersion() != null) { m_logger.debug("pom property override:<version> " + project.getVersion()); }
         } else {
             this.setVersion(project.getVersion());
         }
 
         if (ebi.getDescription() != null) {
             this.setDescription(ebi.getDescription());
-            if (project.getDescription() != null) { m_logger.warn("pom property override:<description> " + project.getDescription()); }
+            if (project.getDescription() != null) { m_logger.debug("pom property override:<description> " + project.getDescription()); }
         } else {
             this.setDescription(project.getDescription());
         }
 
         if (ebi.getDocumentation() != null) {
             this.setDocumentation(ebi.getDocumentation());
-            if (project.getUrl() != null) { m_logger.warn("pom property override:<documentation> " + project.getUrl()); }
+            if (project.getUrl() != null) { m_logger.debug("pom property override:<documentation> " + project.getUrl()); }
         } else {
             this.setDocumentation(project.getUrl());
         }
 
         if (ebi.getSource() != null) {
             this.setSource(ebi.getSource());
-            if (project.getScm() != null) { m_logger.warn("pom property override:<source> " + project.getScm()); }
+            if (project.getScm() != null) { m_logger.debug("pom property override:<source> " + project.getScm()); }
         } else {
             String src = null;
             if (project.getScm() != null) { src = project.getScm().getUrl(); }
@@ -363,7 +363,7 @@
             Iterator it = l.iterator();
             while (it.hasNext()) {
                 if (it.next() != null) {
-                    m_logger.warn("pom property override:<source> " + lic);
+                    m_logger.debug("pom property override:<license> " + lic);
                     break;
                 }
             }