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 ma...@apache.org on 2014/12/09 04:04:26 UTC
svn commit: r1643981 - in /db/derby/code/branches/10.8: ./
java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
java/drda/org/apache/derby/loc/drda/messages_en.properties
Author: mamta
Date: Tue Dec 9 03:04:26 2014
New Revision: 1643981
URL: http://svn.apache.org/r1643981
Log:
DERBY-6768(List the enabled protocols in derby.log for network server configuration)
backporting to 10.8
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/branches/10.8/java/drda/org/apache/derby/loc/drda/messages_en.properties
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 9 03:04:26 2014
@@ -1,4 +1,4 @@
/db/derby/code/branches/10.10:1466378,1476355,1480153,1485958,1493146,1494758,1494888,1525671,1526486,1530796,1535206,1539074,1539108,1554997,1560616,1565415,1575635,1575862,1577421
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/branches/10.9:1370647,1373148,1379219,1384397,1396606,1451023,1462304,1462677,1469552,1469868,1480320,1490291,1491566,1494947,1501816,1504520,1539228,1556068,1565233,1565761,1567826,1569125,1575839,1575933,1585983,1594754
-/db/derby/code/trunk:1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1098040,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,1181756,
1183463,1183503,1183671,1186020,1186691,1188144,1189063,1189201,1189222,1203050,1203252,1204128,1205426,1205757,1207729,1208775,1210846,1212541,1213251,1228332,1228777,1229266,1230480,1230873,1231296,1236887,1239898,1241841,1242098,1242409,1242413,1242460,1242610,1242681,1243878,1244444,1245143,1245226,1290888,1290919,1291057,1291631,1291647,1292084,1292108-1292109,1292941,1293467,1293494,1294275,1294512,1294522,1294592,1295085,1298907,1300459,1301109,1301290,1303630,1305524,1306596,1306600,1309244,1311804,1328061,1329359,1330066,1330482,1330877,1331484,1333305,1334874,1334919,1335418,1335423,1335570,1335677,1336526,1340549,1341204,1341266,1341350,1341622,1345254,1345301,1346054,1350258,1351714,1351795,1352913,1353852,1354015,1356333,1356749,1356766,1359052,1364690,1365661,1371041,1371382,1378206,1379163,1381429,1384035,1390126,1390205,1392847,1394407,1394883,1395482,1398914,1399306,1402111,1404886,1406053,1406083,1406240,1408136,1411160,1412392,1413812,1417991,1424889,1428305,14302
91,1430417,1440586,1442474,1442554,1445030,1446048,1448025,1450363,1450695,1451683,1461415,1463378,1464594,1464934,1465600,1465830,1466097,1466362,1467011,1467170,1468647,1469445,1469802,1469861,1471022,1471079,1471264,1471721,1475624,1479607,1480947,1485938,1488116,1488125,1493077,1495943,1496837,1513218,1518766,1521310,1523501,1523821,1524579,1526172,1529099,1530696,1532997,1535075,1535413,1550287,1553081,1555702,1557823,1564608,1564635,1567787,1578192,1594231,1594451,1596451
+/db/derby/code/branches/10.9:1370647,1373148,1379219,1384397,1396606,1451023,1462304,1462677,1469552,1469868,1480320,1490291,1491566,1494947,1501816,1504520,1539228,1556068,1565233,1565761,1567826,1569125,1575839,1575933,1585983,1594754,1643438
+/db/derby/code/trunk:1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1098040,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,1181756,
1183463,1183503,1183671,1186020,1186691,1188144,1189063,1189201,1189222,1203050,1203252,1204128,1205426,1205757,1207729,1208775,1210846,1212541,1213251,1228332,1228777,1229266,1230480,1230873,1231296,1236887,1239898,1241841,1242098,1242409,1242413,1242460,1242610,1242681,1243878,1244444,1245143,1245226,1290888,1290919,1291057,1291631,1291647,1292084,1292108-1292109,1292941,1293467,1293494,1294275,1294512,1294522,1294592,1295085,1298907,1300459,1301109,1301290,1303630,1305524,1306596,1306600,1309244,1311804,1328061,1329359,1330066,1330482,1330877,1331484,1333305,1334874,1334919,1335418,1335423,1335570,1335677,1336526,1340549,1341204,1341266,1341350,1341622,1345254,1345301,1346054,1350258,1351714,1351795,1352913,1353852,1354015,1356333,1356749,1356766,1359052,1364690,1365661,1371041,1371382,1378206,1379163,1381429,1384035,1390126,1390205,1392847,1394407,1394883,1395482,1398914,1399306,1402111,1404886,1406053,1406083,1406240,1408136,1411160,1412392,1413812,1417991,1424889,1428305,14302
91,1430417,1440586,1442474,1442554,1445030,1446048,1448025,1450363,1450695,1451683,1461415,1463378,1464594,1464934,1465600,1465830,1466097,1466362,1467011,1467170,1468647,1469445,1469802,1469861,1471022,1471079,1471264,1471721,1475624,1479607,1480947,1485938,1488116,1488125,1493077,1495943,1496837,1513218,1518766,1521310,1523501,1523821,1524579,1526172,1529099,1530696,1532997,1535075,1535413,1550287,1553081,1555702,1557823,1564608,1564635,1567787,1578192,1594231,1594451,1596451,1639804
Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1643981&r1=1643980&r2=1643981&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Tue Dec 9 03:04:26 2014
@@ -715,6 +715,26 @@ public final class NetworkServerControlI
return sss2;
}
}
+
+ /*
+ * DERBY-6768(List the enabled protocols in derby.log for network
+ * server configuration)
+ * Get the enabled protocols so we can list them in the log file
+ */
+ private String getEnabledProtocols(SSLServerSocket sslServerSocket) {
+ //Converting the String array of enabled protocols to a String
+ StringBuffer sbf = new StringBuffer();
+ String[] enabledProtocols = sslServerSocket.getEnabledProtocols();
+ if(enabledProtocols.length > 0){
+
+ sbf.append(enabledProtocols[0]);
+ for(int i=1; i < enabledProtocols.length; i++){
+ sbf.append(", ").append(enabledProtocols[i]);
+ }
+
+ }
+ return sbf.toString();
+ }
/**
@@ -785,11 +805,17 @@ public final class NetworkServerControlI
break;
case SSL_BASIC:
consolePropertyMessage("DRDA_SSLReady.I", new String []
- {Integer.toString(portNumber), att_srvclsnm, versionString});
+ {Integer.toString(portNumber), att_srvclsnm, versionString});
+ consolePropertyMessage("DRDA_EnabledProtocols.I", new String []
+ {getEnabledProtocols((SSLServerSocket) serverSocket),
+ att_srvclsnm, versionString});
break;
case SSL_PEER_AUTHENTICATION:
consolePropertyMessage("DRDA_SSLClientAuthReady.I", new String []
- {Integer.toString(portNumber), att_srvclsnm, versionString});
+ {Integer.toString(portNumber), att_srvclsnm, versionString});
+ consolePropertyMessage("DRDA_EnabledProtocols.I", new String []
+ {getEnabledProtocols((SSLServerSocket) serverSocket),
+ att_srvclsnm, versionString});
break;
}
Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=1643981&r1=1643980&r2=1643981&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/loc/drda/messages_en.properties Tue Dec 9 03:04:26 2014
@@ -25,6 +25,7 @@ DRDA_NoInputStream.S=Could not get input
DRDA_Ready.I={1} Network Server - {2} started and ready to accept connections on port {0}
DRDA_SSLReady.I={1} Network Server - {2} started and ready to accept SSL connections on port {0}
DRDA_SSLClientAuthReady.I={1} Network Server - {2} started and ready to accept SSL connections with client authentication on port {0}
+DRDA_EnabledProtocols.I={1} Network Server - {2} Enabled Protocols are {0}
DRDA_UnableToAccept.S=Unable to accept connections.
DRDA_ConnNumber.I=Connection number: {0}.
DRDA_ClientSocketError.S=Error on client socket:\n {0}