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

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

Author: wrzep
Date: 2006-12-22 19:33:16 -0500 (Fri, 22 Dec 2006)
New Revision: 8580

Modified:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/Tools.java
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CheckOutEditor.java
Log:
JBLAB-599
JMM hot redeployment fix.

JBLAB-816
Less noisy debugging in Lines of Code Plugin.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/Tools.java	2006-12-22 23:12:14 UTC (rev 8579)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/Tools.java	2006-12-23 00:33:16 UTC (rev 8580)
@@ -101,8 +101,9 @@
 			// 		Make sure the RMI connector isn't already registered
 			ObjectName cntorServerName = ObjectName.getInstance("connectors:protocol=rmi");
 			if (server.isRegistered(cntorServerName)) {
-				log.warn("MBeanRemoteProxy already registred.");
-				return;
+				
+				log.warn("MBeanRemoteProxy already registred. Unregistering.");	
+				server.unregisterMBean(cntorServerName);
 			}
 			
 			//		 The address of the connector
@@ -118,12 +119,12 @@
 
 			//		 Start the JMXConnectorServer
 			cntorServer.start();
+		
+			log.info("MBeanRemoteProxy created successfully.");
 			
 		} catch (Exception e) {
 			log.error("Unable to start MBeanRemoteProxy", e);
 		}
-		
-		log.info("MBeanRemoteProxy created successfully.");
 	}
 
 	public static ScoresService getScoresService(Properties properties) throws NamingException {	

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CheckOutEditor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CheckOutEditor.java	2006-12-22 23:12:14 UTC (rev 8579)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/plugins/codelines/CheckOutEditor.java	2006-12-23 00:33:16 UTC (rev 8580)
@@ -88,8 +88,6 @@
 	public void addFile(String path, String copyFromPath, long copyFromRevision)
 			throws SVNException {
 		
-		log.debug("File: " + path);
-		
 		isTextMimeType = true;
 	}
 
@@ -158,8 +156,8 @@
 			
 			codeLines += lnReader.getLineNumber();
 			
-			log.debug("File: " + path + ". Number of code lines: "
-											+ lnReader.getLineNumber() + ".");
+		//	log.debug("File: " + path + ". Number of code lines: "
+		//									+ lnReader.getLineNumber() + ".");
 			
 		} catch (Exception e) {