[Jboss-svn-commits] JBL Code SVN: r1751 - in trunk/forge/portal-extensions/forge-status: . src/java/org/jboss/forge/status

[<jbo...@li...>]

Author: wrzep
Date: 2005-12-09 07:52:15 -0500 (Fri, 09 Dec 2005)
New Revision: 1751

Modified:
   trunk/forge/portal-extensions/forge-status/project.xml
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java
Log:
separate xml file for plugins defs and for other params

http://jira.jboss.com/jira/browse/JBLAB-415

Pawel


Modified: trunk/forge/portal-extensions/forge-status/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-status/project.xml	2005-12-09 06:50:00 UTC (rev 1750)
+++ trunk/forge/portal-extensions/forge-status/project.xml	2005-12-09 12:52:15 UTC (rev 1751)
@@ -56,7 +56,7 @@
 		<groupId>kosmos</groupId>
 		<artifactId>kosmos</artifactId>
 		<jar>kosmos-server.jar</jar>
-		<version>1.0</version>
+		<version>1.5</version>
 		<properties>
 			<war.bundle>true</war.bundle>
 		</properties>

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-09 06:50:00 UTC (rev 1750)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2005-12-09 12:52:15 UTC (rev 1751)
@@ -70,7 +70,7 @@
 
 	private HashSet<String> pluginsElements;
 	
-	Status(String portalName, Node pluginsRoot, ScoreAlgorithmFactory scoreAlgorithm) {
+	Status(String portalName, Node statusRoot, Node pluginsRoot, ScoreAlgorithmFactory scoreAlgorithm) {
 		this.portalName = portalName;
 		this.scoreAlgorithm = scoreAlgorithm;
 		

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2005-12-09 06:50:00 UTC (rev 1750)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2005-12-09 12:52:15 UTC (rev 1751)
@@ -45,14 +45,17 @@
 	
 	public StatusDescriptor(String portalName, ContentManager cm) {
 		try {		
-			String pluginsPath = StatusTools.getXmlCmPath(portalName);
+			String statusPath = StatusTools.getXmlCmPath(portalName);
+			Node statusRoot = getRoot(cm , statusPath);
+			
+			String pluginsPath = StatusTools.getXmlPluginsCmPath(portalName);
 			Node pluginsRoot = getRoot(cm, pluginsPath);
 			
 			/*
 			if ((root.getNodeType() == Node.ELEMENT_NODE)
 					&& (root.getNodeName().equals("projects"))) {}*/
 			
-			status = new Status(portalName, pluginsRoot, new WeightedScoreAlgorithmFactory());
+			status = new Status(portalName, statusRoot, pluginsRoot, new WeightedScoreAlgorithmFactory());
 			
 			fillContext();
 			

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java	2005-12-09 06:50:00 UTC (rev 1750)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java	2005-12-09 12:52:15 UTC (rev 1751)
@@ -15,6 +15,7 @@
 	 * <code>STATUS_XML<code> - file defining the list of watched feeds
 	 */
 	private final static String STATUS_XML = 		"status.xml";
+	private final static String PLUGINS_XML = 		"plugins.xml";
 	
 	/**
 	 * <code>STATUS_DIR</code> - directory in which file <code>PODCAST_XML<code> is stored. 
@@ -31,6 +32,10 @@
 		return portalName + "/" + STATUS_DIR + "/" + STATUS_XML;
 	}
 	
+	public static String getXmlPluginsCmPath(String portalName) {
+		return portalName + "/" + STATUS_DIR + "/" + PLUGINS_XML;
+	}
+	
 	public static String getXmlCmPath(String portalName, String filename) {
 		return portalName + "/" + STATUS_DIR + "/" + filename;
 	}