[Jboss-svn-commits] JBL Code SVN: r1596 - in trunk/forge/portal-extensions: forge-freezone/src/java/org/jboss/forge/projects/freezone shotoku/shotoku-base/src/etc shotoku/shotoku-base/src/java/org/jboss/shotoku shotoku/shotoku-svn/src/etc shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service

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

Author: adamw
Date: 2005-11-18 18:33:06 -0500 (Fri, 18 Nov 2005)
New Revision: 1596

Modified:
   trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
   trunk/forge/portal-extensions/shotoku/shotoku-base/src/etc/velocity.properties
   trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
   trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnRepository.java
   trunk/forge/portal-extensions/shotoku/shotoku-svn/src/etc/mime-types.txt
Log:
Velocity logging fixes, mime type for m4v


Modified: trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2005-11-18 20:37:00 UTC (rev 1595)
+++ trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2005-11-18 23:33:06 UTC (rev 1596)
@@ -22,7 +22,6 @@
 package org.jboss.forge.projects.freezone;
 
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.List;
 
 import javax.portlet.PortletException;

Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/etc/velocity.properties
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-base/src/etc/velocity.properties	2005-11-18 20:37:00 UTC (rev 1595)
+++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/etc/velocity.properties	2005-11-18 23:33:06 UTC (rev 1596)
@@ -3,3 +3,5 @@
 shotoku.resource.loader.class=org.jboss.shotoku.velocity.ShotokuResourceLoader
 shotoku.resource.loader.cache=true
 shotoku.resource.loader.modificationCheckInterval=2
+
+runtime.log.logsystem.class=org.apache.velocity.runtime.log.NullLogSystem
\ No newline at end of file

Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java	2005-11-18 20:37:00 UTC (rev 1595)
+++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java	2005-11-18 23:33:06 UTC (rev 1596)
@@ -22,6 +22,7 @@
 package org.jboss.shotoku;
 
 import java.lang.reflect.Constructor;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -54,7 +55,7 @@
 	 * The key is a string representation of parameters with which an
 	 * engine was initialized.
 	 */
-	private Map<String, VelocityEngine> engines;
+	private static Map<String, VelocityEngine> engines;
 	
 	/**
 	 * Gets a root directory that is represented by this content manager.
@@ -150,6 +151,7 @@
 			representation += key + "=" + overProps.get(key) + ",";
 		}
 		
+		representation += ";" + prefix + ";" + id + ";";
 		representation += addIdPrefix;
 		
 		VelocityEngine ve = engines.get(representation);
@@ -176,8 +178,6 @@
 	protected ContentManager(String id, String prefix) {
 		this.id = id;
 		this.prefix = prefix;
-		
-		engines = new HashMap<String, VelocityEngine>();
 	}
 
 	/*
@@ -199,6 +199,8 @@
 	private static Map<String, Constructor> contentManagers;
 
 	static {
+		engines = Collections.synchronizedMap(new HashMap<String, VelocityEngine>());
+		
 		contentManagers = new HashMap<String, Constructor>();
 
 		// Loading configuration file.

Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/etc/mime-types.txt
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/etc/mime-types.txt	2005-11-18 20:37:00 UTC (rev 1595)
+++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/etc/mime-types.txt	2005-11-18 23:33:06 UTC (rev 1596)
@@ -685,7 +685,7 @@
 video/dl					dl
 video/fli					fli
 video/gl					gl
-video/mpeg					mpeg mpg mpe
+video/mpeg					mpeg mpg mpe m4v
 video/mp4					mp4
 video/quicktime					qt mov
 video/mp4v-es

Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnRepository.java
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnRepository.java	2005-11-18 20:37:00 UTC (rev 1595)
+++ trunk/forge/portal-extensions/shotoku/shotoku-svn-service/src/java/org/jboss/shotoku/svn/service/SvnRepository.java	2005-11-18 23:33:06 UTC (rev 1596)
@@ -93,7 +93,7 @@
 	
 	/**
 	 * Tries to perform a cleanup on the local working copy. Called in case
-	 * of execptions that occure while performing other operations.
+	 * of exceptions that occure while performing other operations.
 	 */
 	private void tryCleanup() {
 		try {