You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/01/31 17:04:17 UTC
cvs commit: jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/mimetype TurbineMimeTypeService.java
epugh 2004/01/31 08:04:17
Modified: src/test/org/apache/fulcrum/xmlrpc Tag: PRE_AVALON_BRANCH
XmlRpcTest.java
src/java/org/apache/fulcrum/localization Tag:
PRE_AVALON_BRANCH TurbineLocalizationService.java
src/java/org/apache/fulcrum/mimetype Tag: PRE_AVALON_BRANCH
TurbineMimeTypeService.java
Added: src/test/org/apache/fulcrum/mimetype Tag: PRE_AVALON_BRANCH
MimeTypeTest.java
Log:
Tweaks to work with update commons-configuration api.
Revision Changes Path
No revision
No revision
1.3.2.2 +1 -4 jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/xmlrpc/XmlRpcTest.java
Index: XmlRpcTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/xmlrpc/XmlRpcTest.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- XmlRpcTest.java 24 Nov 2003 14:15:00 -0000 1.3.2.1
+++ XmlRpcTest.java 31 Jan 2004 16:04:17 -0000 1.3.2.2
@@ -161,10 +161,7 @@
manager.setConfiguration(new PropertiesConfiguration(CONFIG_FILE));
manager.init();
}
- catch (IOException ioe)
- {
- reportIOExceptionAndFail("Fulcrum",ioe);
- }
+
catch (Exception e)
{
reportExceptionAndFail("Fulcrum",e);
No revision
No revision
1.3.2.2 +2 -2 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/localization/TurbineLocalizationService.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- TurbineLocalizationService.java 24 Nov 2003 14:15:02 -0000 1.3.2.1
+++ TurbineLocalizationService.java 31 Jan 2004 16:04:17 -0000 1.3.2.2
@@ -174,7 +174,7 @@
//System.err.println("cfg=" + getConfiguration());
bundleNames =
getConfiguration().getStringArray("locale.default.bundles");
- String name = getConfiguration().getString("locale.default.bundle");
+ String name = getConfiguration().getString("locale.default.bundle",null);
if (name != null && name.length() > 0)
{
// Using old-style single bundle name property.
No revision
No revision
1.1.2.1 +120 -0 jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/mimetype/Attic/MimeTypeTest.java
No revision
No revision
1.1.1.1.2.1 +3 -3 jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/mimetype/TurbineMimeTypeService.java
Index: TurbineMimeTypeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/mimetype/TurbineMimeTypeService.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- TurbineMimeTypeService.java 30 May 2002 02:27:24 -0000 1.1.1.1
+++ TurbineMimeTypeService.java 31 Jan 2004 16:04:17 -0000 1.1.1.1.2.1
@@ -125,7 +125,7 @@
{
String path = null;
- if (getConfiguration() != null)
+ if (getConfiguration() != null && getConfiguration().containsKey(MIME_TYPES))
{
path = getConfiguration().getString(MIME_TYPES);
if (path != null)
@@ -149,7 +149,7 @@
mimeTypeMap = new MimeTypeMap();
}
- if (getConfiguration() != null)
+ if (getConfiguration() != null && getConfiguration().containsKey(CHARSETS))
{
path = getConfiguration().getString(CHARSETS);
if (path != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org