cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r390863 - in /cocoon/trunk/core/cocoon-core/src: main/java/org/apache/cocoon/core/CoreUtil.java test/java/org/apache/cocoon/SitemapTestCase.java
Date Sun, 02 Apr 2006 17:19:13 GMT
Author: cziegeler
Date: Sun Apr  2 10:19:12 2006
New Revision: 390863

URL: http://svn.apache.org/viewcvs?rev=390863&view=rev
Log:
Correct error messages

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapTestCase.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java?rev=390863&r1=390862&r2=390863&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java Sun Apr
 2 10:19:12 2006
@@ -617,8 +617,9 @@
 
         return mainContext;
     }
+
     /**
-     * @see org.apache.cocoon.core.BootstrapEnvironment#getConfigFile(java.lang.String)
+     * Get the URL of the main Cocoon configuration file.
      */
     protected URL getConfigFile(final String configFileName)
     throws Exception {
@@ -646,7 +647,7 @@
                 result = new URL(usedFileName);
             }
         } catch (Exception mue) {
-            String msg = "Setting for 'configurations' is invalid : " + usedFileName;
+            String msg = "Setting for 'configuration' is invalid : " + usedFileName;
             this.log.error(msg, mue);
             throw new CoreInitializationException(msg, mue);
         }
@@ -657,7 +658,7 @@
                 try {
                     result = resultFile.getCanonicalFile().toURL();
                 } catch (Exception e) {
-                    String msg = "Init parameter 'configurations' is invalid : " + usedFileName;
+                    String msg = "Setting for 'configuration' is invalid : " + usedFileName;
                     this.log.error(msg, e);
                     throw new CoreInitializationException(msg, e);
                 }
@@ -665,7 +666,7 @@
         }
 
         if (result == null) {
-            String msg = "Init parameter 'configuration' doesn't name an existing resource
: " + usedFileName;
+            String msg = "Setting for 'configuration' doesn't name an existing resource :
" + usedFileName;
             this.log.error(msg);
             throw new CoreInitializationException(msg);
         }

Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapTestCase.java?rev=390863&r1=390862&r2=390863&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapTestCase.java Sun
Apr  2 10:19:12 2006
@@ -104,7 +104,8 @@
     
     protected String getConfiguration() {
         String className = this.getClass().getName();
-        return className.substring(className.lastIndexOf('.') + 1) + ".xconf";
+        String dir = className.replace('.', '/');
+        return dir + ".xconf";
     }
     
     /**



Mime
View raw message