[Jboss-svn-commits] JBL Code SVN: r2053 - trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

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

Author: unibrew
Date: 2006-01-10 16:06:26 -0500 (Tue, 10 Jan 2006)
New Revision: 2053

Modified:
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java
Log:
[JBLAB-582] Modifying Polls and DownloadCounters to use different dir for their dynamic content.

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java	2006-01-10 21:00:00 UTC (rev 2052)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java	2006-01-10 21:06:26 UTC (rev 2053)
@@ -45,6 +45,15 @@
 	public static final String FORGE_FILE_ACCESS_DIR="file-access";
 	
 	/**
+	 * Name of the directory in dynamicly changing portal content dir containing download counters' files.
+	 */
+	public static final String DOWNLOAD_COUNTERS_DIR="downloads";
+	/**
+	 * Dir in portal-content containing dynamicly changing portal content.
+	 */
+	public static final String DYNAMIC_CONTENT_DIR = "dynamic-content";
+	
+	/**
 	 * Name of JSP view file.
 	 */
 	public static final String DOWNLOADCOUNTER_JSP="normal.jsp";
@@ -144,7 +153,7 @@
 	 * @return Path to main download counters descriptor.
 	 */
 	public static String getMainXmlPath (String portalName) {
-		return portalName + File.separator + ProjectsHelper.MEMBERS_DIR + File.separator + ProjectsHelper.DOWNLOADCOUNTERMAIN_DESC;
+		return DYNAMIC_CONTENT_DIR+File.separator+portalName+File.separator+DOWNLOAD_COUNTERS_DIR+File.separator+ProjectsHelper.DOWNLOADCOUNTERMAIN_DESC;
 	}
 	
 	/**

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java	2006-01-10 21:00:00 UTC (rev 2052)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java	2006-01-10 21:06:26 UTC (rev 2053)
@@ -88,6 +88,11 @@
 	public static final String POLLS_DIR="polls";
 	
 	/**
+	 * Dir for dynamicly changing content in portal.
+	 */
+	public static final String DYNAMIC_CONTENT_DIR ="dynamic-content";
+	
+	/**
 	 * Name of JSP view file prepared for displaying voting results.
 	 */
 	public static final String POLLS_INFO_JSP="polls_info.jsp";
@@ -129,7 +134,7 @@
 	 * @return Path to polls descriptor.
 	 */
 	public static String getMainXmlPath (final String portalName) {
-		return portalName + File.separator + ProjectsHelper.MEMBERS_DIR + File.separator + ProjectsHelper.POLLS_DESC;
+		return DYNAMIC_CONTENT_DIR+File.separator+portalName+File.separator+POLLS_DIR+File.separator+ProjectsHelper.POLLS_DESC;
 	}
 	
 	/**

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java	2006-01-10 21:00:00 UTC (rev 2052)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java	2006-01-10 21:06:26 UTC (rev 2053)
@@ -47,7 +47,7 @@
 	/**
 	 * Location where the *database* is stored in content repository.
 	 */
-	public static final String DATABASE_LOCATION = "default/polls/database/";
+	public static final String DATABASE_LOCATION = "dynamic-content/default/polls/database/";
 	
 	/**
 	 * Shotoku Directory object which points to the *database*.