You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2005/09/28 21:23:06 UTC
svn commit: r292269 -
/cocoon/blocks/hsqldb/trunk/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Author: vgritsenko
Date: Wed Sep 28 12:22:58 2005
New Revision: 292269
URL: http://svn.apache.org/viewcvs?rev=292269&view=rev
Log:
preserve configured path for the error message
Modified:
cocoon/blocks/hsqldb/trunk/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Modified: cocoon/blocks/hsqldb/trunk/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/hsqldb/trunk/java/org/apache/cocoon/components/hsqldb/ServerImpl.java?rev=292269&r1=292268&r2=292269&view=diff
==============================================================================
--- cocoon/blocks/hsqldb/trunk/java/org/apache/cocoon/components/hsqldb/ServerImpl.java (original)
+++ cocoon/blocks/hsqldb/trunk/java/org/apache/cocoon/components/hsqldb/ServerImpl.java Wed Sep 28 12:22:58 2005
@@ -52,7 +52,7 @@
private static final String CONTEXT_PROTOCOL = "context:/";
private static final String DEFAULT_DB_NAME = "cocoondb";
private static final String DEFAULT_DB_PATH = "context://WEB-INF/db";
-
+
/** Cocoon context **/
private org.apache.cocoon.environment.Context cocoonContext;
@@ -96,14 +96,15 @@
m_daemonThreadPoolName = params.getParameter("thread-pool-name", m_daemonThreadPoolName);
- String dbPath = params.getParameter("path", DEFAULT_DB_PATH);
+ final String dbCfgPath = params.getParameter("path", DEFAULT_DB_PATH);
+ String dbPath = dbCfgPath;
// Test if we are running inside a WAR file
if(dbPath.startsWith(ServerImpl.CONTEXT_PROTOCOL)) {
dbPath = this.cocoonContext.getRealPath(dbPath.substring(ServerImpl.CONTEXT_PROTOCOL.length()));
}
if (dbPath == null) {
- throw new ParameterException("The hsqldb cannot be used inside a WAR file. " +
- "Real path for <" + dbPath + "> is null.");
+ throw new ParameterException("The hsqldb cannot be used inside an unexpanded WAR file. " +
+ "Real path for <" + dbCfgPath + "> is null.");
}
String dbName = params.getParameter("name", DEFAULT_DB_NAME);