epugh 2003/11/02 14:43:47
Modified: src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
Added: src/test/org/apache/turbine/services/rundata
DefaultTurbineRunDataTest.java
Log:
Fixed up use of deprecate TurbineMimetype code. Added unit test.
Revision Changes Path
1.18 +16 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultTurbineRunData.java 14 Oct 2003 10:25:25 -0000 1.17
+++ DefaultTurbineRunData.java 2 Nov 2003 22:43:47 -0000 1.18
@@ -69,6 +69,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -77,11 +78,13 @@
import org.apache.ecs.Document;
import org.apache.ecs.Element;
import org.apache.ecs.StringElement;
+import org.apache.fulcrum.mimetype.MimeTypeService;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.mimetype.TurbineMimeTypes;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.FormMessages;
import org.apache.turbine.util.ServerData;
@@ -332,7 +335,7 @@
}
String charset = defaultCharSet;
-
+
if (StringUtils.isEmpty(charset))
{
log.debug("charset is empty!");
@@ -348,8 +351,16 @@
if (!locale.equals(Locale.US))
{
- log.debug("We have US Locale!");
- charset = TurbineMimeTypes.getCharSet(locale);
+ log.debug("We don't have US Locale!");
+ AvalonComponentService acs=
(AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ MimeTypeService mimeTypeService=null;
+ try {
+ mimeTypeService=
(MimeTypeService)acs.lookup(MimeTypeService.ROLE);
+ }
+ catch (ComponentException ce){
+ throw new RuntimeException(ce);
+ }
+ charset = mimeTypeService.getCharSet(locale);
log.debug("Charset now " + charset);
}
1.1
jakarta-turbine-2/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java
Index: DefaultTurbineRunDataTest.java
===================================================================
package org.apache.turbine.services.rundata;
/*
* ==================================================================== The
* Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The end-user documentation included with the redistribution, if any,
* must include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if and
* wherever such third-party acknowledgments normally appear.
* 4. The names "Apache" and "Apache Software Foundation" and "Apache Turbine"
* must not be used to endorse or promote products derived from this software
* without prior written permission. For written permission, please contact
* [EMAIL PROTECTED]
* 5. Products derived from this software may not be called "Apache", "Apache
* Turbine", nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation. For more information on the
* Apache Software Foundation, please see <http://www.apache.org/> .
*/
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
public class DefaultTurbineRunDataTest extends BaseTestCase
{
private static TurbineConfig tc = null;
public DefaultTurbineRunDataTest(String name) throws Exception
{
super(name);
}
public void testGetDefaultCharSetWithMimeType()
{
Turbine.getConfiguration().setProperty(
TurbineConstants.LOCALE_DEFAULT_CHARSET_KEY,
"");
Turbine.getConfiguration().setProperty(
TurbineConstants.LOCALE_DEFAULT_COUNTRY_KEY,
"UK");
DefaultTurbineRunData runData =
new DefaultTurbineRunData();
assertEquals("ISO-8859-1", runData.getDefaultCharSet());
}
public void setUp() throws Exception
{
tc =
new TurbineConfig(
".",
"/conf/test/TestFulcrumComponents.properties");
tc.initialize();
}
public void tearDown() throws Exception
{
if (tc != null)
{
tc.dispose();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
