[jboss-svn-commits] JBL Code SVN: r15128 - in labs/jbosslabs/trunk/stats-server/sources/metrics: common and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Sep 14 15:42:53 EDT 2007


Author: wrzep
Date: 2007-09-14 15:42:53 -0400 (Fri, 14 Sep 2007)
New Revision: 15128

Removed:
   labs/jbosslabs/trunk/stats-server/sources/metrics/build.properties
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Locations.java
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ConfgurationImpl.java
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ServiceConfImpl.java
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/UpdatesConfImpl.java
Modified:
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/maven.xml
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/project.xml
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/ProjectTools.java
   labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java
   labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml
   labs/jbosslabs/trunk/stats-server/sources/metrics/project.properties
   labs/jbosslabs/trunk/stats-server/sources/metrics/project.xml
   labs/jbosslabs/trunk/stats-server/sources/metrics/service/build.properties.sample
   labs/jbosslabs/trunk/stats-server/sources/metrics/service/maven.xml
   labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties
   labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.xml
   labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java
Log:
JBLAB-891
cleanup. maven all finally works fine


Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics/build.properties
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/build.properties	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/build.properties	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,2 +0,0 @@
-# By default do not deploy JMM service
-jmm.deploy.service=false

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/maven.xml	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/maven.xml	2007-09-14 19:42:53 UTC (rev 15128)
@@ -6,7 +6,7 @@
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
 
 	<goal name="all">
-		<attainGoal name="clean" />	
+		<attainGoal name="clean" />
 		<attainGoal name="build" />
 	</goal>
 
@@ -14,7 +14,9 @@
 		<attainGoal name="jar" />
 	</goal>
 
-	
+	<goal name="deploy">
+	</goal>
+
 	<goal name="clean">
 		<ant:delete dir="${maven.build.dir}"/>
 		<ant:delete dir="${maven.build.dest}"/>

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/project.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/project.xml	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/project.xml	2007-09-14 19:42:53 UTC (rev 15128)
@@ -5,84 +5,79 @@
   See terms of license at gnu.org. 
  -->
 <project>
-    <pomVersion>3</pomVersion>
-<!--     <extend>../project.xml</extend>  -->
-    <id>jmm-common</id>
-    <name>JEMS Maturity Matrix Common Library</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Pawel Wrzeszcz</name>
-        <url></url>
-    </organization>
-    <description></description>
-    
-    <dependencies>
-    
-	<dependency>
-	    <groupId>jboss-forge</groupId>
-	    <artifactId>forge-common</artifactId>
-	    <version>1.0</version>
-	</dependency>
+	<id>metrics-common</id>
+	<name>Labs Metrics Common Library</name>
+	<currentVersion>1.0</currentVersion>
+	<organization>
+		<name>Pawel Wrzeszcz</name>
+		<url>
+		</url>
+	</organization>
+	<description>
+	</description>
 
-	<dependency>
-	    <groupId>shotoku</groupId>
-	    <artifactId>shotoku-base</artifactId>
-	    <version>1.0</version>
-	    <jar>shotoku-base.jar</jar>
-	</dependency>
-	
-	<dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-jmx</artifactId>
-            <version>1.0</version>
-            <jar>jboss-jmx.jar</jar>
-        </dependency>
-	
+	<dependencies>
 
-  <!-- JBoss EJB3 dependencies -->
+		<dependency>
+			<groupId>jboss-forge</groupId>
+			<artifactId>forge-common</artifactId>
+			<version>1.0</version>
+		</dependency>
 
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-jmx</artifactId>
+			<version>1.0</version>
+			<jar>jboss-jmx.jar</jar>
+		</dependency>
 
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>ejb3-persistence</artifactId>
-		<version>3.0RC6</version>
-		<jar>ejb3-persistence.jar</jar>
-	</dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-ejb3x</artifactId>
-		<version>3.0RC6</version>
-		<jar>jboss-ejb3x.jar</jar>
-     </dependency>
-     
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-j2ee</artifactId>
-		<version></version>
-		<jar>jboss-j2ee.jar</jar>
-        </dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-annotations-ejb3</artifactId>
-		<version></version>
-		<jar>jboss-annotations-ejb3.jar</jar>
-        </dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jbossall-client</artifactId>
-		<version>3.2.3</version>
-        </dependency>
 
-	<dependency>
-		<groupId>jaxb</groupId>
-		<artifactId>JAXB2</artifactId>
-		<version>2.0</version>
-		<jar>jaxb-api.jar</jar>
-        </dependency>
- 	   
-    </dependencies>
-    
-    	 <build>
-        <sourceDirectory>src/java</sourceDirectory>
-    </build>
+		<!-- JBoss EJB3 dependencies -->
+
+
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>ejb3-persistence</artifactId>
+			<version>3.0RC6</version>
+			<jar>ejb3-persistence.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-ejb3x</artifactId>
+			<version>3.0RC6</version>
+			<jar>jboss-ejb3x.jar</jar>
+		</dependency>
+
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-j2ee</artifactId>
+			<version>
+			</version>
+			<jar>jboss-j2ee.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-annotations-ejb3</artifactId>
+			<version>
+			</version>
+			<jar>jboss-annotations-ejb3.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jbossall-client</artifactId>
+			<version>3.2.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>jaxb</groupId>
+			<artifactId>JAXB2</artifactId>
+			<version>2.0</version>
+			<jar>jaxb-api.jar</jar>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+	</build>
 </project>

Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Locations.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Locations.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Locations.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,122 +0,0 @@
-package org.jboss.labs.metrics.common;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-
-/**
- * Common functions.
- * @author Pawel Wrzeszcz
- */
-public class Locations {
-	
-	/** <code>STATUS_XML<code> - file defining the list of watched feeds */
-	private final static String JMM_XML 						= "jmm.xml";
-	private final static String JMM_PLUGINS_XML 				= "plugins.xml";
-	private final static String JMM_SERVICE_PROPERTIES 		= "jmm.service.properties";
-	private final static String PROJECTS_SERVICE_PROPERTIES 	= "projects.service.properties";
-	private final static String UPDATE_PROPERTIES 			= "update.properties";
-	
-	/** <code>JMM_DIR</code> - directory in which file <code>JMM_XML<code> is stored. */
-	private final static String JMM_DIR 						= "jmm";
-	
-	private final static String JMM_JSP			 			= "jmm.jsp";
-	private final static String JMM_JSP_DIR 					= "jmm";
-	private final static String PROJECT_DETAILS_JSP			= "project_details.jsp";
-	private final static String COLUMN_DETAILS_JSP			= "column_details.jsp";
-	
-	/** Shotoku directory to store historical scores */
-	private static final String SHOTOKU_JMM_DIR 				= "jmm";
-	
-	/**
-	 * Path to the xml file with the Status Matrix properties.
-	 */
-	public static String getXmlCmPath(String portalName) {
-		return portalName + "/" + JMM_DIR + "/" + JMM_XML;
-	}
-	
-	/**
-	 * Path to the xml file defining Plugins used in the Matrix.
-	 */
-	public static String getXmlJMMPluginsCmPath(String portalName) {
-		return portalName + "/" + JMM_DIR + "/" + JMM_PLUGINS_XML;
-	}
-
-	/**
-	 * Path to the file containing ejb3 service properties.
-	 */
-	public static String getServicePropertiesCmPath(String portalName) {
-		return portalName + "/" + JMM_DIR + "/" + Locations.JMM_SERVICE_PROPERTIES;
-	}
-	
-	/**
-	 * Path to the file containing Projects Service properties.
-	 */
-	public static String getProjectsServicePropertiesCmPath(String portalName) {
-		return portalName + "/" + JMM_DIR + "/" + Locations.PROJECTS_SERVICE_PROPERTIES;
-	}
-	
-	/**
-	 * Path to the file containing auto-update properties
-	 */
-	public static String getUpdatePropertiesCmPath(String portalName) {
-		return portalName + "/" + JMM_DIR + "/" + Locations.UPDATE_PROPERTIES;
-	}
-	
-	/**
-	 * Path to the projects.xml file.
-	 */
-	public static String getProjectsXmlPath(String portalName) {	
-		return portalName + "/" + ProjectsHelper.PROJECTS_DESC;
-	}
-	
-	/**
-	 * Set containing paths to project.xml files for all projects. 
-	 */
-	public static Set<String> getProjectXmlPathsSet(String portalName) {
-		
-		Set<String> pathsSet = new HashSet<String>();
-		
-		Projects projects = ProjectsHelper.getProjects(portalName);
-		Set<String> projectIdsSet = projects.getProjectIds(
-				(PermissionsChecker) new NullPermissionsChecker(), null);
-		
-		for (String projectId : projectIdsSet) {
-			
-			String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR
-								+ "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC;
-			pathsSet.add(projectXmlPath);
-		}
-		return pathsSet;
-	}
-	
-	/**
-	 * Path to the jsp file responsible file displaying the Status Matrix.
-	 */
-	public static String getJspCmPath() {
-		return 	JMM_JSP_DIR	 + "/" + JMM_JSP;
-	}
-
-	/**
-	 * Path to the jsp file responsible for displaying project details.
-	 */
-	public static String getPrjDetailsJspCmPath() {
-		return 	JMM_JSP_DIR	 + "/" + PROJECT_DETAILS_JSP;
-	}
-
-	/**
-	 * Path to the jsp file responsible displaying column details.
-	 */
-	public static String getColumnDetailsJspCmPath() {
-		return JMM_JSP_DIR + "/" + COLUMN_DETAILS_JSP;
-	}
-
-	public static String getShotokuStatusPath(String portalName) {
-		return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_JMM_DIR;
-	}
-}

Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ConfgurationImpl.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ConfgurationImpl.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ConfgurationImpl.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,142 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.labs.metrics.common.protocol.conf.impl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.labs.metrics.common.Locations;
-import org.jboss.labs.metrics.common.Tags;
-import org.jboss.labs.metrics.common.exceptions.InvalidPluginsConfigurationException;
-import org.jboss.labs.metrics.common.protocol.conf.Configuration;
-import org.jboss.labs.metrics.common.protocol.conf.PluginConf;
-import org.jboss.labs.metrics.common.protocol.conf.ServiceConf;
-import org.jboss.labs.metrics.common.protocol.conf.UpdatesConf;
-import org.jboss.labs.metrics.common.tools.Tools;
-import org.jboss.logging.Logger;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.Node;
-import org.jboss.shotoku.exceptions.RepositoryException;
-import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-
-/**
-* @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
-*/
-public class ConfgurationImpl implements Configuration {
-
-	private String portalName;
-	private List<String> projectIds;
-	private List<PluginConf> pluginsConf;
-	
-	private ServiceConf scoresServiceConf;
-	private ServiceConf projectsServiceConf;
-	private UpdatesConf updateConf;
-
-	private static final long serialVersionUID = 772452316632341L;
-	private static Logger log = Logger.getLogger(ConfgurationImpl.class);
-	
-	
-	public ConfgurationImpl(String portalName, ContentManager cm)
-							throws RepositoryException, ResourceDoesNotExist,
-								   IOException, SAXException {
-		
-		String servicePath = Locations.getServicePropertiesCmPath(portalName);
-		Node serviceNode = cm.getNode(servicePath);
-		scoresServiceConf = new ServiceConfImpl(serviceNode);
-		
-		String projectsServicePath = Locations.getProjectsServicePropertiesCmPath(portalName);
-		Node projectsServiceNode = cm.getNode(projectsServicePath);
-		projectsServiceConf = new ServiceConfImpl(projectsServiceNode);
-		
-		String updatePropertiesPath = Locations.getUpdatePropertiesCmPath(portalName);
-		Node updatePropertiesNode = cm.getNode(updatePropertiesPath);
-		 updateConf = new UpdatesConfImpl(updatePropertiesNode);
-		
-		String pluginsPath = Locations.getXmlJMMPluginsCmPath(portalName);
-		org.w3c.dom.Node pluginsNode = Tools.getRoot(cm, pluginsPath);
-		pluginsConf = getPluginsConfList(pluginsNode);
-		
-		Projects projects = ProjectsHelper.getProjects(portalName);
-		projectIds = new ArrayList<String>(
-				projects.getProjectIds(
-						(PermissionsChecker) new NullPermissionsChecker(), null));
-		
-	}
-	
-	public String getPortalName() {
-		return portalName;
-	}
-	
-	public List<String> getProjectIds() {
-		return projectIds;
-	}
-	
-	public List<PluginConf> getPluginsConf() {
-		return pluginsConf;
-	}
-	
-	public ServiceConf getProjectsServiceConf() {
-		return projectsServiceConf;
-	}
-	
-	public ServiceConf getScoresServiceConf() {
-		return scoresServiceConf;
-	}
-	
-	public UpdatesConf getUpdateConf() {
-		return updateConf;
-	}
-
-	public static List<PluginConf> getPluginsConfList(org.w3c.dom.Node pluginsRoot) {
-	
-		List<PluginConf> pluginsConfList = new ArrayList<PluginConf>();
-	
-		NodeList pluginNodes = pluginsRoot.getChildNodes();
-		
-		for (int i = 0; i < pluginNodes.getLength(); i++) {
-			org.w3c.dom.Node pluginNode = pluginNodes.item(i);
-	
-			if (pluginNode.getNodeName() != Tags.PLUGIN_ELEMENT) {
-				continue;
-			}
-			
-			try {
-				PluginConfImpl pluginConf = new PluginConfImpl(pluginNode);
-				pluginsConfList.add(pluginConf);
-				
-			} catch (InvalidPluginsConfigurationException e) {
-				log.warn("Invalid plugin configuration. " + e.getMessage());
-			}
-		}
-	
-		return pluginsConfList;
-	}
-}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ServiceConfImpl.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ServiceConfImpl.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/ServiceConfImpl.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.labs.metrics.common.protocol.conf.impl;
-
-import java.util.Properties;
-
-import org.jboss.labs.metrics.common.protocol.conf.ServiceConf;
-import org.jboss.labs.metrics.common.tools.Tools;
-import org.jboss.shotoku.Node;
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-public class ServiceConfImpl implements ServiceConf {
-	
-
-	private static final long serialVersionUID = 9276134986978721L;
-	
-	private Properties properties;
-	
-	
-	public ServiceConfImpl(Node serviceNode) {
-			
-		properties = Tools.parseProperties(serviceNode, null);										
-	}
-
-
-	public Properties getProperties() {
-		
-		return properties;
-	}
-
-
-
-}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/UpdatesConfImpl.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/UpdatesConfImpl.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/protocol/conf/impl/UpdatesConfImpl.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.labs.metrics.common.protocol.conf.impl;
-
-import java.util.Properties;
-
-import org.jboss.labs.metrics.common.Constants;
-import org.jboss.labs.metrics.common.Tags;
-import org.jboss.labs.metrics.common.protocol.conf.UpdatesConf;
-import org.jboss.labs.metrics.common.tools.Tools;
-
-import org.jboss.shotoku.Node;
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-public class UpdatesConfImpl implements UpdatesConf {
-		
-	
-	private static final long serialVersionUID = 54399755111252464L;
-	
-	private int firstUpdate;
-	private int updateInterval;
-	private int updateStartHour;
-	private int updateStartMinute;
-	
-	public UpdatesConfImpl(Node serviceNode) {
-		
-		Properties properties = Tools.parseProperties(serviceNode, null);
-				
-		firstUpdate = Tools.parseIntProperty(properties,
-								Tags.SERVICE_FIRST_UPDATE_ELEMENT,
-								Constants.FIRST_UPDATE_INTERVAL_DEFAULT);
-		
-		updateInterval = Tools.parseIntProperty(properties,
-								Tags.SERVICE_UPDATE_INTERVAL_ELEMENT,
-								Constants.SCORES_UPDATE_INTERVAL_DEFAULT);
-		
-		updateStartHour = Tools.parseIntProperty(properties,
-								Tags.SERVICE_UPDATE_START_HOUR_ELEMENT,
-								Constants.UPDATE_START_HOUR_DEFAULT);
-		
-		updateStartMinute = Tools.parseIntProperty(properties,
-								Tags.SERVICE_UPDATE_START_MINUTE_ELEMENT,
-								Constants.UPDATE_START_MINUTE_DEFAULT);
-		
-	}
-
-	public int getFirstUpdate() {
-		
-		return firstUpdate;
-	}
-
-	public int getUpdateInterval() {
-		
-		return updateInterval;
-	}
-
-	public int getUpdateStartHour() {
-		
-		return updateStartHour;
-	}
-
-	public int getUpdateStartMinute() {
-		
-		return updateStartMinute;
-	}
-
-}
\ No newline at end of file

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/ProjectTools.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/ProjectTools.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/ProjectTools.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -14,7 +14,6 @@
 import org.jboss.forge.common.projects.project.IssueTrackerType;
 import org.jboss.forge.common.projects.project.Project;
 import org.jboss.forge.common.projects.project.RepoType;
-import org.jboss.forge.common.projects.project.Repository;
 import org.jboss.forge.common.ejb3.ProjectsService;
 import org.jboss.logging.Logger;
 
@@ -55,22 +54,8 @@
 		
 		return service.getProjectJems(projectId);
 	}
-
-	public static List<String> getProjectCcURLs(String projectId) {
-
-		List<BuildResult> buildResults = service.getProjectBuildresults(projectId);
-		List<String> ccBuildURLs = new ArrayList<String>();
-		
-		for (BuildResult buildResult : buildResults) {
-			
-			if (buildResult.getType() == BuildType.CRUISE_CONTROL) {
-				ccBuildURLs.add(buildResult.getValue());
-			}
-		}
-		
-		return ccBuildURLs;
-	}
 	
+	/*
 	public static List<Repository> getProjectSVNRepositories(String projectId) {
 		
 		List<Repository> repoList = service.getProjectRepositories(projectId);
@@ -84,26 +69,11 @@
 		}
 		
 		return svnRepoList;
-	}
+	}*/
 
-	public static IssueTracker getProjectJiraIssueTracker(String projectId) {
-		
-		List<IssueTracker> issueTrackerList = service.getProjectIssueTrackers(projectId);
-		
-		for (IssueTracker tracker : issueTrackerList) {
-			
-			if (tracker.getType() == IssueTrackerType.JIRA) {
-				
-				return tracker;
-			}
-		}
-		
-		return null;
-	}
-
 	public static Project getProject(String projectId) {
 		
-		return service.getProjectByName(projectId);
+		return service.getProjectById(projectId);
 	}
 
 	public static Downloads getProjectDownloads(String projectId) {

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/tools/Tools.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,6 +1,5 @@
 package org.jboss.labs.metrics.common.tools;
 
-import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -21,20 +20,13 @@
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 
-import org.apache.xerces.parsers.DOMParser;
 import org.jboss.labs.metrics.common.Constants;
 import org.jboss.labs.metrics.common.protocol.ScoresService;
 import org.jboss.labs.metrics.common.protocol.conf.ScoresUpdater;
 
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
 
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
 /**
  * Common functions.
  * @author Pawel Wrzeszcz
@@ -64,16 +56,6 @@
         return list;
 	}	
 	
-	public static Node getRoot(ContentManager cm, String path)
-					throws IOException, SAXException, ResourceDoesNotExist {
-		
-		DOMParser parser = new DOMParser();
-		parser.parse(new InputSource(cm.getNode(path).getContentInputStream()));
-
-		Node root = parser.getDocument().getDocumentElement();
-		return root;
-	}
-	
 	public static String formatDate(Calendar cal) {
 		
 		Date date = cal.getTime();
@@ -169,34 +151,6 @@
 		return updater;
 	}
 
-	public static Properties parseProperties(org.jboss.shotoku.Node serviceNode,
-											String excludePrefix) {
-		
-		Properties props = new Properties();
-		
-		if (serviceNode == null) {
-			return props;
-		}
-		
-		String propsString = serviceNode.getContent();
-		String[] propsArr = propsString.split("\n");
-		
-		for (String propString : propsArr) {
-			
-			String[] propArr = propString.split("=");
-			
-			if ((propArr != null) && (propArr.length == 2) && 
-					((excludePrefix == null) ||
-								(!propArr[0].startsWith(excludePrefix)))) {
-				
-				props.put(propArr[0], propArr[1]);
-			}
-					
-		}
-		
-		return props;
-	}
-
 	public static int parseIntProperty(Properties properties, String element,
 														int defaultValue) {
 		

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml	2007-09-14 19:42:53 UTC (rev 15128)
@@ -7,74 +7,37 @@
 	<!-- Default war-project goals -->
 
 	<goal name="all">
-<!--
 		<attainGoal name="clean" />
 		<attainGoal name="build" />
 		<attainGoal name="deploy" />
--->
 	</goal>
 
 	<goal name="build">
-<!--
-		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-common" 
+			  <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/common" 
 			       banner="Building" 
 			       goals="build" ignoreFailures="false" />
-		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet" 
-			       banner="Building" 
-			       goals="build" ignoreFailures="false" />
-       <j:if test="${jmm.deploy.service}">
-			  <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service" 
+			  <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/service" 
 			  	   banner="Building" 
 	  		       goals="build" ignoreFailures="false" />
-		</j:if>
--->
 	</goal>
     
 	<goal name="deploy">
-	<!--	<ant:copy todir="${local.deploy.dir}" file="jmm-common/target/jmm-common.jar" />
-		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet" 
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/common" 
+					       banner="Deploy" 
+					       goals="deploy" ignoreFailures="false" />
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/service" 
 			       banner="Deploy" 
 			       goals="deploy" ignoreFailures="false" />
-		<j:if test="${jmm.deploy.service}">
-             <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service" 
-			       banner="Deploy" 
-			       goals="deploy" ignoreFailures="false" />
-         </j:if>-->
 	</goal>
 	
 	<goal name="clean">
-	
-		<!-- A trick to allow us execute scripts in jmm-portlet and jmm-common even if jmm-common.jar is not build -->
-<!--
- 	    <u:file var="file" name="jmm-common/target/jmm-common.jar" />
-		<j:if test="${!(file.exists())}">
-			<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-common" 
-			       banner="Building" 
-			       goals="build" ignoreFailures="false" />
-		</j:if>
-
-		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet" 
+		<!--
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/common" 
+					       banner="Clean" 
+					       goals="clean" ignoreFailures="false" /> -->
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/service" 
 			       banner="Clean" 
-			       goals="clean" ignoreFailures="false" />
-       <j:if test="${jmm.deploy.service}">
-			  <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service" 
-			  	   banner="Clean" 
-	  		       goals="clean" ignoreFailures="false" />
-		</j:if>
-		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-common" 
-			       banner="Clean" 
-			       goals="clean" ignoreFailures="false" />
-
--->			
-		<!-- Clead old "status" files -->
-		<ant:delete file="${local.deploy.dir}/forge-status.war" />
-		<ant:delete file="${local.deploy.dir}/status-service.ejb3" />
-		<ant:delete file="${local.deploy.dir}/status-common.jar" />
-		
-		<!-- Clean JMM service local files (in case we want to use remote service) -->
-		<ant:delete file="${local.deploy.dir}/jmm-service.ejb3" />
-		<ant:delete dir="${local.deploy.dir}/jmm-service.sar" />
-		<ant:delete file="${local.deploy.dir}/JMM-ds.xml" />
+			       goals="clean" ignoreFailures="false" />		
 	</goal>
 	
 </project>

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/project.properties
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/project.properties	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/project.properties	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,6 +1,3 @@
 maven.repo.remote=http://repo1.maven.org/maven
 maven.junit.fork=yes
 maven.war.src=${basedir}/src/web
-
-maven.jar.override=on
-maven.jar.jmm-common=jmm-common/target/jmm-common.jar
\ No newline at end of file

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/project.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/project.xml	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/project.xml	2007-09-14 19:42:53 UTC (rev 15128)
@@ -6,9 +6,9 @@
  -->
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
-    <id>jmm</id>
-    <name>JEMS Maturity Matrix</name>
+    <extend>../project.xml</extend>
+    <id>metrics</id>
+    <name>Labs Metrics</name>
     <currentVersion>1.0</currentVersion>
     <organization>
         <name>Pawel Wrzeszcz</name>

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/build.properties.sample
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/build.properties.sample	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/build.properties.sample	2007-09-14 19:42:53 UTC (rev 15128)
@@ -1,3 +1,3 @@
 # Path to JBoss AS for JMM service
-jmm.service.server.dir=
-jmm.service.deploy.dir=${jmm.service.server.dir}/server/all/deploy
\ No newline at end of file
+metrics.service.server.dir=
+metrics.service.deploy.dir=${jmm.service.server.dir}/server/all/deploy
\ No newline at end of file

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/maven.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/maven.xml	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/maven.xml	2007-09-14 19:42:53 UTC (rev 15128)
@@ -6,7 +6,7 @@
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven">
 
 	<goal name="all">
-		<attainGoal name="clean" />	
+		<attainGoal name="clean" />
 		<attainGoal name="build" />
 		<attainGoal name="deploy" />
 	</goal>
@@ -15,73 +15,53 @@
 		<attainGoal name="build-ejb"/>
 		<attainGoal name="build-sar"/>
 	</goal>
-    
-    <goal name="build-ejb">
-	    	<ant:copy todir="target/classes/META-INF">
+
+	<goal name="build-ejb">
+		<ant:copy todir="target/classes/META-INF">
 			<ant:fileset dir="src/etc/META-INF" />
 		</ant:copy>
 		<attainGoal name="ejb" />
-		<ant:move tofile="target/${jmm.service.final.name}" file="target/${maven.final.name}.jar" />
-    </goal>
-    
-    <goal name="build-sar">
--  		<ant:copy todir="target/${jmm.service.sar}" file="../jmm-common/target/${jmm.common.final.name}" />
-		<ant:copy todir="target/${jmm.service.sar}">
-		       <ant:fileset dir="src/app" flatten="true" overwrite="true">
-		          <ant:filename name="**" />
-		       </ant:fileset>
-		 </ant:copy>
-    </goal>
-    
+		<ant:move tofile="target/${metrics.service.final.name}" file="target/${maven.final.name}.jar" />
+	</goal>
+
+	<goal name="build-sar">
+-  		<ant:copy todir="target/${metrics.service.sar}" file="../common/target/${metrics.common.final.name}" />
+		<ant:copy todir="target/${metrics.service.sar}">
+			<ant:fileset dir="src/app" flatten="true" overwrite="true">
+				<ant:filename name="**" />
+			</ant:fileset>
+		</ant:copy>
+	</goal>
+
 	<goal name="deploy">
-		<attainGoal name="deploy-sar"/>	
+		<attainGoal name="deploy-sar"/>
 		<attainGoal name="deploy-ejb"/>
 		<attainGoal name="copy-configuration"/>
-	</goal>	
-	
+	</goal>
+
 	<goal name="deploy-sar">
-		<ant:copy todir="${jmm.service.deploy.dir}">
-		    <ant:fileset dir="target/" flatten="true" overwrite="true">
-		          <ant:filename name="**/${jmm.service.sar}/**" />
-		    </ant:fileset>
+		<ant:copy todir="${local.deploy.dir}">
+			<ant:fileset dir="target/" flatten="true" overwrite="true">
+				<ant:filename name="**/${metrics.service.sar}/**" />
+			</ant:fileset>
 		</ant:copy>
 	</goal>
-	
-		<goal name="deploy-ejb">
-	  	<ant:copy todir="${jmm.service.deploy.dir}" file="target/${jmm.service.final.name}" />
+
+	<goal name="deploy-ejb">
+		<ant:copy todir="${local.deploy.dir}" file="target/${metrics.service.final.name}" />
 	</goal>
-	
+
 	<goal name="copy-configuration">
-		<ant:copy todir="${jmm.service.deploy.dir}" overwrite="true">
-	    		<ant:fileset dir="conf">
+		<ant:copy todir="${local.deploy.dir}" overwrite="true">
+			<ant:fileset dir="conf">
 				<exclude name="**/*.sample"/>
 			</ant:fileset>
 		</ant:copy>
 	</goal>
-	
+
 	<goal name="clean">
 		<ant:delete dir="${maven.build.dir}"/>
 		<ant:delete dir="${maven.build.dest}"/>
 	</goal>
 
-	<goal name="install">
-	       	<ant:copy todir="${jmm.service.server.dir}/server/all/lib"
-		                  file="etc/mysql-connector-java-3.1.12-bin.jar" />
-	</goal>
-	
-	<goal name="help">
-	<echo>
-JEMS Maturity Matrix
-		
-Please note that the default configuration affects only JMM portlet and common libraries.
-		
-If you want to build/deploy the JMM service, please create or modify the following files:
-1. build.properties
-2. jmm-service/build.properties
-3. jmm-service/conf/JMM-ds.xml
-and execute "maven install".
-
-JMM service depends on the JMM common libraries that can be build by executing "maven build" in the ../jmm-common directory.
-	</echo>
-	</goal>
 </project>

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties	2007-09-14 19:42:53 UTC (rev 15128)
@@ -5,8 +5,8 @@
 maven.ejb.includes=**/service/**,**/META-INF/**
 
 maven.jar.override=on
-maven.jar.jmm-common=${basedir}/../jmm-common/target/jmm-common.jar
+maven.jar.metrics-common=common/target/metrics-common.jar
 
-jmm.service.final.name=jmm-service.ejb3
-jmm.common.final.name=jmm-common.jar
-jmm.service.sar=jmm-service.sar/
\ No newline at end of file
+metrics.service.final.name=metrics-service.ejb3
+metrics.common.final.name=metrics-common.jar
+metrics.service.sar=metrics-service.sar/
\ No newline at end of file

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.xml	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.xml	2007-09-14 19:42:53 UTC (rev 15128)
@@ -5,130 +5,93 @@
   See terms of license at gnu.org. 
  -->
 <project>
-    <pomVersion>3</pomVersion>
-    <id>jmm-service</id>
-    <name>JEMS Maturity Matrix Service</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Pawel Wrzeszcz</name>
-        <url></url>
-    </organization>
-    <description></description>
-    
-    <dependencies>
-    
-	<dependency>
-	    <groupId>jboss-forge</groupId>
-	    <artifactId>forge-common</artifactId>
-	    <version>1.0</version>
-	    <properties>
-                <ejb.manifest.classpath>true</ejb.manifest.classpath>
-				<ejb.bundle>true</ejb.bundle>
-        </properties>
-	</dependency>
+	<pomVersion>3</pomVersion>
+	<id>metrics-service</id>
+	<name>Labs Metrics Service</name>
+	<extend>../project.xml</extend>
+	<currentVersion>1.0</currentVersion>
+	<organization>
+		<name>Pawel Wrzeszcz</name>
+		<url>
+		</url>
+	</organization>
+	<description>
+	</description>
 
-	<dependency>
-	    <groupId>jmm</groupId>
-	    <artifactId>jmm-common</artifactId>
-	    <jar>jmm-common.jar</jar>
-	    <properties>
+	<dependencies>
+
+		<dependency>
+			<groupId>metrics</groupId>
+			<artifactId>metrics-common</artifactId>
+			<jar>metrics-common.jar</jar>
+			<properties>
                 <ejb.manifest.classpath>true</ejb.manifest.classpath>
-                <ejb.bundle>false</ejb.bundle>
+				<ejb.bundle>false</ejb.bundle>
             </properties>
-	</dependency>
+		</dependency>
 
-  	<dependency>
-		<id>jdom</id>
-		<version>1.0</version>
-		<properties>
-			<war.bundle>true</war.bundle>
-		</properties>
-	</dependency>
-	
-	<dependency>
-	    <groupId>tmate</groupId>
-	    <artifactId>javasvn</artifactId>
-	    <version>1.0</version>
-	    <jar>javasvn.jar</jar>
-	    <properties>
-			<ejb.bundle>true</ejb.bundle>
-	    </properties>
-	</dependency>
-	
-	<dependency>
-		<groupId>kosmos</groupId>
-		<artifactId>kosmos</artifactId>
-		<jar>kosmos-server.jar</jar>
-		<version>1.0</version>
-		<properties>
-			<ejb.manifest.classpath>true</ejb.manifest.classpath>
-			<ejb.bundle>true</ejb.bundle>
-		</properties>
-	</dependency>
+		<dependency>
+			<id>jdom</id>
+			<version>1.0</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
 
-    <dependency>
-        <groupId>hessian</groupId>
-        <artifactId>hessian</artifactId>
-        <version>3.0.1</version> 
-		<jar>hessian-3.0.13.jar</jar>
-        <properties>
-            <ejb.manifest.classpath>true</ejb.manifest.classpath>
-			<ejb.bundle>true</ejb.bundle>
-        </properties>
-    </dependency>
-<!--
-	<dependency>
-	    <groupId>shotoku</groupId>
-	    <artifactId>shotoku-base</artifactId>
-	    <version>1.0</version>
-	    <jar>shotoku-base.jar</jar>
-            <properties>
-                <ejb.manifest.classpath>true</ejb.manifest.classpath>
-            </properties>
-	</dependency>
--->
-  <!-- JBoss EJB3 dependencies -->
+		<dependency>
+			<groupId>tmate</groupId>
+			<artifactId>javasvn</artifactId>
+			<version>1.0</version>
+			<jar>javasvn.jar</jar>
+			<properties>
+				<ejb.bundle>true</ejb.bundle>
+			</properties>
+		</dependency>
 
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>ejb3-persistence</artifactId>
-		<version>3.0RC6</version>
-		<jar>ejb3-persistence.jar</jar>
-	</dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-ejb3x</artifactId>
-		<version>3.0RC6</version>
-		<jar>jboss-ejb3x.jar</jar>
-        </dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-j2ee</artifactId>
-		<version></version>
-		<jar>jboss-j2ee.jar</jar>
-        </dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jboss-annotations-ejb3</artifactId>
-		<version></version>
-		<jar>jboss-annotations-ejb3.jar</jar>
-        </dependency>
-	<dependency>
-		<groupId>jboss</groupId>
-		<artifactId>jbossall-client</artifactId>
-		<version>3.2.3</version>
-        </dependency>
-        
-	<dependency>
-		<groupId>jaxb</groupId>
-		<artifactId>JAXB2</artifactId>
-		<version>2.0</version>
-		<jar>jaxb-api.jar</jar>
-        </dependency>
-	   
-    </dependencies>
-    
-     <build>
-        <sourceDirectory>src/java</sourceDirectory>
-    </build>
+		<!-- JBoss EJB3 dependencies -->
+
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>ejb3-persistence</artifactId>
+			<version>3.0RC6</version>
+			<jar>ejb3-persistence.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-ejb3x</artifactId>
+			<version>3.0RC6</version>
+			<jar>jboss-ejb3x.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-j2ee</artifactId>
+			<version>
+			</version>
+			<jar>jboss-j2ee.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jboss-annotations-ejb3</artifactId>
+			<version>
+			</version>
+			<jar>jboss-annotations-ejb3.jar</jar>
+		</dependency>
+		<dependency>
+			<groupId>jboss</groupId>
+			<artifactId>jbossall-client</artifactId>
+			<version>3.2.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>jaxb</groupId>
+			<artifactId>JAXB2</artifactId>
+			<version>2.0</version>
+			<jar>jaxb-api.jar</jar>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+	</build>
 </project>

Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java	2007-09-14 19:18:59 UTC (rev 15127)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/plugins/codelines/CodeLinesPlugin.java	2007-09-14 19:42:53 UTC (rev 15128)
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.jboss.forge.common.projects.project.Repository;
+//import org.jboss.forge.common.projects.project.Repository;
 import org.jboss.labs.metrics.common.exceptions.GetPluginValueException;
 import org.jboss.labs.metrics.common.exceptions.UnableToGetPluginValueException;
 import org.jboss.labs.metrics.common.protocol.conf.Plugin;
@@ -60,19 +60,20 @@
 					throws UnableToGetPluginValueException, GetPluginValueException {
 			
 		long cl = 0;
-			
+		
+		/*
 		List<Repository> repoList = ProjectTools.getProjectSVNRepositories(projectId);
 			
 		if (repoList == null) {
 				
 			throw new UnableToGetPluginValueException("Repository not specified.");
 		}
-			
+		
 		for (Repository repository : repoList) {
 				
 			cl += analyze(repository.getValue());
 		}
-		
+		*/
 	
 		return cl;
 	}




More information about the jboss-svn-commits mailing list