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 da...@apache.org on 2006/06/09 02:17:14 UTC
svn commit: r412888 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/
client/org/apache/derby/client/resources/ client/org/apache/derby/jdbc/
engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/
Author: davidvc
Date: Thu Jun 8 17:17:14 2006
New Revision: 412888
URL: http://svn.apache.org/viewvc?rev=412888&view=rev
Log:
DERBY-851: Remove org.apache.derby.client.resource package - no longer needed.
Also removed client/am/ResourceUtilities.java, which was an API on
top of the resources package. Converted single usage of ResourceUtilities
to use MessageUtil instead.
Removed:
db/derby/code/trunk/java/client/org/apache/derby/client/am/ResourceUtilities.java
db/derby/code/trunk/java/client/org/apache/derby/client/resources/
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=412888&r1=412887&r2=412888&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Thu Jun 8 17:17:14 2006
@@ -23,7 +23,6 @@
import java.sql.SQLException;
import java.util.TreeMap;
-import org.apache.derby.client.resources.ResourceKeys;
import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.shared.common.error.ExceptionUtil;
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java?rev=412888&r1=412887&r2=412888&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java Thu Jun 8 17:17:14 2006
@@ -24,16 +24,15 @@
import java.util.Properties;
import java.sql.SQLException;
import org.apache.derby.client.am.Configuration;
-import org.apache.derby.client.am.ResourceUtilities;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.am.Utils;
import org.apache.derby.client.am.Version;
import org.apache.derby.client.am.ClientJDBCObjectFactory;
import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.net.ClientJDBCObjectFactoryImpl;
-import org.apache.derby.client.resources.ResourceKeys;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.SQLState;
+import org.apache.derby.shared.common.reference.MessageId;
public class ClientDriver implements java.sql.Driver {
@@ -212,9 +211,11 @@
properties.getProperty(Attribute.PASSWORD_ATTR));
driverPropertyInfo[0].description =
- ResourceUtilities.getResource(ResourceKeys.propertyDescription__user);
+ SqlException.getMessageUtil().getTextMessage(
+ MessageId.CONN_USERNAME_DESCRIPTION);
driverPropertyInfo[1].description =
- ResourceUtilities.getResource(ResourceKeys.propertyDescription__password);
+ SqlException.getMessageUtil().getTextMessage(
+ MessageId.CONN_PASSWORD_DESCRIPTION);
driverPropertyInfo[0].required = true;
driverPropertyInfo[1].required = false; // depending on the security mechanism
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=412888&r1=412887&r2=412888&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties Thu Jun 8 17:17:14 2006
@@ -1453,6 +1453,8 @@
J129=an Open Query command was issued for a query which was already open
J130=A PROTOCOL Invalid FDOCA Description Error was detected
J131=A PROTOCOL Data Stream Syntax Error was detected. Reason: 0x{0}.
+J132=The user name for the connection
+J133=The user''s password for the connection
# Authentication
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java?rev=412888&r1=412887&r2=412888&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java Thu Jun 8 17:17:14 2006
@@ -148,6 +148,8 @@
String CONN_DRDA_QRYOPEN = "J129";
String CONN_DRDA_INVALIDFDOCA = "J130";
String CONN_DRDA_DATASTREAM_SYNTAX_ERROR = "J131";
+ String CONN_USERNAME_DESCRIPTION = "J132";
+ String CONN_PASSWORD_DESCRIPTION = "J133";
/*
** Authentication