You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2005/09/28 20:03:35 UTC
svn commit: r292232 -
/db/derby/code/branches/10.1/java/drda/org/apache/derby/drda/NetServlet.java
Author: kmarsden
Date: Wed Sep 28 11:03:29 2005
New Revision: 292232
URL: http://svn.apache.org/viewcvs?rev=292232&view=rev
Log:
DERBY-385
merge 292230 from trunk
servlet Back to Main Page link points to csnet instead of derbynet
contributed by Myrna van Lunteren
Modified:
db/derby/code/branches/10.1/java/drda/org/apache/derby/drda/NetServlet.java
Modified: db/derby/code/branches/10.1/java/drda/org/apache/derby/drda/NetServlet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/drda/org/apache/derby/drda/NetServlet.java?rev=292232&r1=292231&r2=292232&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ db/derby/code/branches/10.1/java/drda/org/apache/derby/drda/NetServlet.java Wed Sep 28 11:03:29 2005
@@ -51,7 +51,7 @@
public class NetServlet extends HttpServlet {
private final static int MAX_CONNECT_TRYS = 20;
private final static String SERVLET_PROP_MESSAGES = "org.apache.derby.loc.drda.servlet";
- private final static String SERVLET_ADDRESS = "csnet";
+ private final static String SERVLET_ADDRESS = "derbynet";
private String formHeader = null;
private String host = "localhost";
@@ -885,7 +885,7 @@
}
/**
* Determine the locale file needed for this browsers preferences
- * Defaults to the settings for db2j.locale and db2j.codeset if set
+ * Defaults to the settings for derby.locale and derby.codeset if set
* English otherwise if browsers preferences can't be found
*
* @param request HttpServetRequest for forms
@@ -896,7 +896,7 @@
LocalizedResource localUtil;
String acceptLanguage = request.getHeader("Accept-Language");
localUtil = new LocalizedResource(null,null,SERVLET_PROP_MESSAGES);
- // if no language specified use one set by db2j.locale, db2j.codeset
+ // if no language specified use one set by derby.locale, derby.codeset
locale = null;
if (acceptLanguage == null)
{