Index: java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourceReference.java =================================================================== --- java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourceReference.java (revision 430808) +++ java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourceReference.java (working copy) @@ -147,7 +147,7 @@ else if (property.equals("shutdownDatabase")) value = "shutdown"; else - value = "XX_" + property + "_" + val; + value = "XX_" + property + "=" + val; setMethod.invoke(ds, new Object[] {value}); continue; Index: java/testing/org/apache/derbyTesting/functionTests/master/dataSourceReference.out =================================================================== --- java/testing/org/apache/derbyTesting/functionTests/master/dataSourceReference.out (revision 430808) +++ java/testing/org/apache/derbyTesting/functionTests/master/dataSourceReference.out (working copy) @@ -24,28 +24,28 @@ populated DataSource recreated using Reference as org.apache.derby.jdbc.EmbeddedDataSource Start compare recreated attributesAsPassword=true - connectionAttributes=XX_connectionAttributes_2135 + connectionAttributes=XX_connectionAttributes=2135 createDatabase=create - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 shutdownDatabase=shutdown - user=XX_user_447 + user=XX_user=447 Completed compare recreated populated DataSource recreated using serialization Start compare recreated attributesAsPassword=true - connectionAttributes=XX_connectionAttributes_2135 + connectionAttributes=XX_connectionAttributes=2135 createDatabase=create - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 shutdownDatabase=shutdown - user=XX_user_447 + user=XX_user=447 Completed compare recreated DataSource class org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource property list @@ -72,28 +72,28 @@ populated DataSource recreated using Reference as org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource Start compare recreated attributesAsPassword=true - connectionAttributes=XX_connectionAttributes_2135 + connectionAttributes=XX_connectionAttributes=2135 createDatabase=create - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 shutdownDatabase=shutdown - user=XX_user_447 + user=XX_user=447 Completed compare recreated populated DataSource recreated using serialization Start compare recreated attributesAsPassword=true - connectionAttributes=XX_connectionAttributes_2135 + connectionAttributes=XX_connectionAttributes=2135 createDatabase=create - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 shutdownDatabase=shutdown - user=XX_user_447 + user=XX_user=447 Completed compare recreated DataSource class org.apache.derby.jdbc.EmbeddedXADataSource property list @@ -120,28 +120,28 @@ populated DataSource recreated using Reference as org.apache.derby.jdbc.EmbeddedXADataSource Start compare recreated attributesAsPassword=true - connectionAttributes=XX_connectionAttributes_2135 + connectionAttributes=XX_connectionAttributes=2135 createDatabase=create - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 shutdownDatabase=shutdown - user=XX_user_447 + user=XX_user=447 Completed compare recreated populated DataSource recreated using serialization Start compare recreated attributesAsPassword=true - connectionAttributes=XX_connectionAttributes_2135 + connectionAttributes=XX_connectionAttributes=2135 createDatabase=create - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 shutdownDatabase=shutdown - user=XX_user_447 + user=XX_user=447 Completed compare recreated DataSource class org.apache.derby.jdbc.ClientDataSource property list @@ -184,39 +184,39 @@ Completed compare recreated populated DataSource recreated using Reference as org.apache.derby.jdbc.ClientDataSource Start compare recreated - connectionAttributes=XX_connectionAttributes_2135 - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + connectionAttributes=XX_connectionAttributes=2135 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 portNumber=1070 retrieveMessageText=false securityMechanism=1805 - serverName=XX_serverName_1048 - traceDirectory=XX_traceDirectory_1476 - traceFile=XX_traceFile_911 + serverName=XX_serverName=1048 + traceDirectory=XX_traceDirectory=1476 + traceFile=XX_traceFile=911 traceFileAppend=true traceLevel=1031 - user=XX_user_447 + user=XX_user=447 Completed compare recreated populated DataSource recreated using serialization Start compare recreated - connectionAttributes=XX_connectionAttributes_2135 - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + connectionAttributes=XX_connectionAttributes=2135 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 portNumber=1070 retrieveMessageText=false securityMechanism=1805 - serverName=XX_serverName_1048 - traceDirectory=XX_traceDirectory_1476 - traceFile=XX_traceFile_911 + serverName=XX_serverName=1048 + traceDirectory=XX_traceDirectory=1476 + traceFile=XX_traceFile=911 traceFileAppend=true traceLevel=1031 - user=XX_user_447 + user=XX_user=447 Completed compare recreated DataSource class org.apache.derby.jdbc.ClientConnectionPoolDataSource property list @@ -259,39 +259,39 @@ Completed compare recreated populated DataSource recreated using Reference as org.apache.derby.jdbc.ClientConnectionPoolDataSource Start compare recreated - connectionAttributes=XX_connectionAttributes_2135 - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + connectionAttributes=XX_connectionAttributes=2135 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 portNumber=1070 retrieveMessageText=false securityMechanism=1805 - serverName=XX_serverName_1048 - traceDirectory=XX_traceDirectory_1476 - traceFile=XX_traceFile_911 + serverName=XX_serverName=1048 + traceDirectory=XX_traceDirectory=1476 + traceFile=XX_traceFile=911 traceFileAppend=true traceLevel=1031 - user=XX_user_447 + user=XX_user=447 Completed compare recreated populated DataSource recreated using serialization Start compare recreated - connectionAttributes=XX_connectionAttributes_2135 - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + connectionAttributes=XX_connectionAttributes=2135 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 portNumber=1070 retrieveMessageText=false securityMechanism=1805 - serverName=XX_serverName_1048 - traceDirectory=XX_traceDirectory_1476 - traceFile=XX_traceFile_911 + serverName=XX_serverName=1048 + traceDirectory=XX_traceDirectory=1476 + traceFile=XX_traceFile=911 traceFileAppend=true traceLevel=1031 - user=XX_user_447 + user=XX_user=447 Completed compare recreated DataSource class org.apache.derby.jdbc.ClientXADataSource property list @@ -334,38 +334,38 @@ Completed compare recreated populated DataSource recreated using Reference as org.apache.derby.jdbc.ClientXADataSource Start compare recreated - connectionAttributes=XX_connectionAttributes_2135 - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + connectionAttributes=XX_connectionAttributes=2135 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 portNumber=1070 retrieveMessageText=false securityMechanism=1805 - serverName=XX_serverName_1048 - traceDirectory=XX_traceDirectory_1476 - traceFile=XX_traceFile_911 + serverName=XX_serverName=1048 + traceDirectory=XX_traceDirectory=1476 + traceFile=XX_traceFile=911 traceFileAppend=true traceLevel=1031 - user=XX_user_447 + user=XX_user=447 Completed compare recreated populated DataSource recreated using serialization Start compare recreated - connectionAttributes=XX_connectionAttributes_2135 - dataSourceName=XX_dataSourceName_1420 - databaseName=XX_databaseName_1206 - description=XX_description_1188 + connectionAttributes=XX_connectionAttributes=2135 + dataSourceName=XX_dataSourceName=1420 + databaseName=XX_databaseName=1206 + description=XX_description=1188 loginTimeout=1280 - password=XX_password_883 + password=XX_password=883 portNumber=1070 retrieveMessageText=false securityMechanism=1805 - serverName=XX_serverName_1048 - traceDirectory=XX_traceDirectory_1476 - traceFile=XX_traceFile_911 + serverName=XX_serverName=1048 + traceDirectory=XX_traceDirectory=1476 + traceFile=XX_traceFile=911 traceFileAppend=true traceLevel=1031 - user=XX_user_447 + user=XX_user=447 Completed compare recreated Completed dataSourceReference