[jboss-svn-commits] JBL Code SVN: r8536 - in labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service: . src/java/org/jboss/forge/jmm/service/plugins/codelines

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2006-12-22 07:00:33 -0500 (Fri, 22 Dec 2006)
New Revision: 8536

Modified:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/AddedCodeLinesPlugin.java
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesTotalPlugin.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-816
Logging was corrupted.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml	2006-12-22 00:47:10 UTC (rev 8535)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml	2006-12-22 12:00:33 UTC (rev 8536)
@@ -76,7 +76,7 @@
 			<ejb.bundle>true</ejb.bundle>
         </properties>
     </dependency>
-
+<!--
 	<dependency>
 	    <groupId>shotoku</groupId>
 	    <artifactId>shotoku-base</artifactId>
@@ -86,7 +86,7 @@
                 <ejb.manifest.classpath>true</ejb.manifest.classpath>
             </properties>
 	</dependency>
-
+-->
   <!-- JBoss EJB3 dependencies -->
 
 	<dependency>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/AddedCodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/AddedCodeLinesPlugin.java	2006-12-22 00:47:10 UTC (rev 8535)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/AddedCodeLinesPlugin.java	2006-12-22 12:00:33 UTC (rev 8536)
@@ -29,6 +29,7 @@
 import org.jboss.forge.jmm.common.exceptions.InvalidPluginPropertiesException;
 import org.jboss.forge.jmm.common.protocol.ScoresManager;
 import org.jboss.forge.jmm.common.tools.Plugins;
+import org.jboss.logging.Logger;
 
 /**
 * @author Pawel Wrzeszcz
@@ -40,6 +41,8 @@
 
 	private int days;
 	
+	protected static Logger log = Logger.getLogger(AddedCodeLinesPlugin.class);
+	
 	@Override
 	public void init(String id, String portalName, List<String> projectIds,
 									Plugins plugins, Properties properties, ScoresManager scoresManager)
@@ -65,6 +68,8 @@
 	@Override
 	protected long getPluginValue(String url, String userName, String password) {
 	
+		log.info("Analyzing repository " + url + "...");
+		
 		long ret = 0;
 		
 		if ((userName != null) && (password != null)) {
@@ -74,7 +79,11 @@
 			ret = CodeLinesEvaluator.getAddedCodeLines(url, days);
 		}
 		
-		return Math.max(ret,0); // Do not report decrease of number of lines??
+		ret = Math.max(ret,0); // Do not report decrease of number of lines??
+		
+		log.info("Number of lines of code: " + ret);
+		
+		return ret;
 	}
 	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java	2006-12-22 00:47:10 UTC (rev 8535)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesPlugin.java	2006-12-22 12:00:33 UTC (rev 8536)
@@ -27,7 +27,6 @@
 import org.jboss.forge.common.projects.project.Repository;
 import org.jboss.forge.jmm.common.protocol.conf.Plugin;
 import org.jboss.forge.jmm.common.tools.ProjectTools;
-import org.jboss.logging.Logger;
 
 /**
 * @author Pawel Wrzeszcz
@@ -47,12 +46,8 @@
 	 */
 	protected abstract long getPluginValue(String url, String userName, String password); 
 	
-	protected static Logger log;
-	
 	public CodeLinesPlugin() {
 		super();
-		
-		log = Logger.getLogger(this.getClass());
 	}
 	
 	@Override
@@ -78,12 +73,6 @@
 
 	private long analyze(String url) {
 		
-		log.info("Analyzing repository " + url); 
-		
-		long cl = getPluginValue(url, null, null);
-		
-		log.info("Score: " + cl);
-		
-		return cl;
+		return getPluginValue(url, null, null);
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesTotalPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesTotalPlugin.java	2006-12-22 00:47:10 UTC (rev 8535)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CodeLinesTotalPlugin.java	2006-12-22 12:00:33 UTC (rev 8536)
@@ -37,6 +37,8 @@
 	@Override
 	protected long getPluginValue(String url, String userName, String password) {
 		
+		log.info("Analyzing repository " + url + "...");
+		
 		if ((userName != null) && (password != null)) {
 			return CodeLinesEvaluator.getCodeLinesNumber(url, userName, password);
 		}
@@ -52,6 +54,8 @@
 			log.debug("Error: ", e);
 		}
 		
+		log.info("Number of lines of code: " + cl);
+		
 		return cl;
 	}