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 my...@apache.org on 2014/05/16 02:44:18 UTC
svn commit: r1595085 - in /db/derby/code/branches/10.4: ./ bin/ java/
java/client/org/apache/derby/client/net/ java/drda/org/apache/derby/drda/
java/drda/org/apache/derby/impl/drda/
java/engine/org/apache/derby/iapi/reference/ java/testing/org/apache/d...
Author: myrnavl
Date: Fri May 16 00:44:17 2014
New Revision: 1595085
URL: http://svn.apache.org/r1595085
Log:
DERBY-6438; Explicitly grant SocketPermission "listen" in default server policy
merge of revision 1556909 from 10.5
Modified:
db/derby/code/branches/10.4/ (props changed)
db/derby/code/branches/10.4/KEYS (props changed)
db/derby/code/branches/10.4/LICENSE (props changed)
db/derby/code/branches/10.4/NOTICE (props changed)
db/derby/code/branches/10.4/README (props changed)
db/derby/code/branches/10.4/RELEASE-NOTES.html (props changed)
db/derby/code/branches/10.4/STATUS (props changed)
db/derby/code/branches/10.4/bin/ (props changed)
db/derby/code/branches/10.4/build.xml (props changed)
db/derby/code/branches/10.4/index.html (props changed)
db/derby/code/branches/10.4/java/ (props changed)
db/derby/code/branches/10.4/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/NetworkServerControl.java
db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy
db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy
db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/reference/Property.java
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
db/derby/code/branches/10.4/maven/ (props changed)
db/derby/code/branches/10.4/plugins/ (props changed)
db/derby/code/branches/10.4/published_api_overview.html (props changed)
db/derby/code/branches/10.4/releaseSummary.xml (props changed)
db/derby/code/branches/10.4/tools/ (props changed)
Propchange: db/derby/code/branches/10.4/
------------------------------------------------------------------------------
Merged /db/derby/code/branches/10.9:r1556068
Merged /db/derby/code/trunk:r1553081
Merged /db/derby/code/branches/10.5:r1556909
Merged /db/derby/code/branches/10.7:r1556368
Merged /db/derby/code/branches/10.6:r1556796
Merged /db/derby/code/branches/10.10:r1554997
Merged /db/derby/code/branches/10.8:r1556267
Propchange: db/derby/code/branches/10.4/KEYS
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/KEYS:1554997
+/db/derby/code/branches/10.5/KEYS:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/KEYS:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/KEYS:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/KEYS:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/KEYS:1491566,1556068
+/db/derby/code/trunk/KEYS:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,96189
2,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/LICENSE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/LICENSE:1554997
+/db/derby/code/branches/10.5/LICENSE:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/LICENSE:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/LICENSE:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/LICENSE:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/LICENSE:1491566,1556068
+/db/derby/code/trunk/LICENSE:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,96
1892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/NOTICE:1554997
+/db/derby/code/branches/10.5/NOTICE:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/NOTICE:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/NOTICE:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/NOTICE:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/NOTICE:1491566,1556068
+/db/derby/code/trunk/NOTICE:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,961
892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/README
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/README:1554997
+/db/derby/code/branches/10.5/README:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/README:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/README:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/README:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/README:1491566,1556068
+/db/derby/code/trunk/README:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,961
892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/RELEASE-NOTES.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/RELEASE-NOTES.html:1554997
+/db/derby/code/branches/10.5/RELEASE-NOTES.html:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/RELEASE-NOTES.html:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/RELEASE-NOTES.html:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/RELEASE-NOTES.html:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/RELEASE-NOTES.html:1491566,1556068
+/db/derby/code/trunk/RELEASE-NOTES.html:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,95861
8,959550,961892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/STATUS
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/STATUS:1554997
+/db/derby/code/branches/10.5/STATUS:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/STATUS:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/STATUS:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/STATUS:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/STATUS:1491566,1556068
+/db/derby/code/trunk/STATUS:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,961
892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/bin:1554997
+/db/derby/code/branches/10.5/bin:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/bin:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/bin:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/bin:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/bin:1491566,1556068
+/db/derby/code/trunk/bin:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,961892
,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/build.xml
------------------------------------------------------------------------------
svn:mergeinfo = /db/derby/code/branches/10.6/build.xml:1556796
Propchange: db/derby/code/branches/10.4/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/index.html:1554997
+/db/derby/code/branches/10.5/index.html:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/index.html:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/index.html:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/index.html:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/index.html:1491566,1556068
+/db/derby/code/trunk/index.html:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550
,961892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/java/
------------------------------------------------------------------------------
svn:mergeinfo = /db/derby/code/branches/10.6/java:1556796
Propchange: db/derby/code/branches/10.4/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
Merged /db/derby/code/branches/10.6/java/client/org/apache/derby/client/net/NetCursor.java:r1556796
Merged /db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/NetCursor.java:r1556909
Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/NetworkServerControl.java Fri May 16 00:44:17 2014
@@ -638,6 +638,15 @@ public class NetworkServerControl{
System.setProperty( Property.DERBY_SECURITY_HOST, getHostNameForSocketPermission( server ) );
//
+ // Forcibly set the following property so that it will be correctly
+ // substituted into the default policy file. This is the hostname for
+ // SocketPermissions. This is an internal property which customers
+ // may not override.
+ //
+ System.setProperty(Property.DERBY_SECURITY_PORT,
+ String.valueOf(server.getPort()));
+
+ //
// Forcibly set the following property. This is the parameter in
// the Basic policy which points at the directory where the embedded and
// network codesources. Do not let the customer
Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy Fri May 16 00:44:17 2014
@@ -100,6 +100,13 @@ grant codeBase "${derby.install.url}derb
permission java.net.SocketPermission "*", "accept";
+// Allow the server to listen to the socket on the port specified with the
+// -p option to "NetworkServerControl start" on the command line, or with
+// the portNumber parameter to the NetworkServerControl constructor in the
+// API, or with the property derby.drda.portNumber. The default is 1527.
+ permission java.net.SocketPermission "localhost:${derby.security.port}",
+ "listen";
+
//
// Needed for server tracing.
//
Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy Fri May 16 00:44:17 2014
@@ -91,6 +91,14 @@ grant codeBase "${derby.install.url}derb
permission java.net.SocketPermission "*", "accept";
+// Allow the server to listen to the socket on the default port (1527).
+// If you have specified another port number with the -p option to
+// "NetworkServerControl start" on the command line, or with the portNumber
+// parameter to the NetworkServerControl constructor in the API, or with the
+// property derby.drda.portNumber, you should change the port number in the
+// permission statement accordingly.
+ permission java.net.SocketPermission "localhost:1527", "listen";
+
//
// Needed for server tracing.
//
Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Fri May 16 00:44:17 2014
@@ -378,6 +378,14 @@ public final class NetworkServerControlI
public String getHost() { return hostArg; }
/**
+ * Get the port where we listen for connections.
+ * @return the port number
+ */
+ public int getPort() {
+ return portNumber;
+ }
+
+ /**
* Return true if the customer forcibly overrode our decision to install a
* default SecurityManager.
*/
Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/reference/Property.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/reference/Property.java?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/reference/Property.java (original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/reference/Property.java Fri May 16 00:44:17 2014
@@ -328,7 +328,7 @@ public interface Property {
String DATABASE_PROPERTIES_ONLY = "derby.database.propertiesOnly";
/**
- * Ths property is private to Derby.
+ * This property is private to Derby.
* This property is forcibly set by the Network Server to override
* any values which the user may have set. This property is only used to
* parameterize the Basic security policy used by the Network Server.
@@ -337,7 +337,7 @@ public interface Property {
public static final String DERBY_INSTALL_URL = "derby.install.url";
/**
- * Ths property is private to Derby.
+ * This property is private to Derby.
* This property is forcibly set by the Network Server to override
* any values which the user may have set. This property is only used to
* parameterize the Basic security policy used by the Network Server.
@@ -345,6 +345,15 @@ public interface Property {
**/
public static final String DERBY_SECURITY_HOST = "derby.security.host";
+ /**
+ * This property is private to Derby.
+ * This property is forcibly set by the Network Server to override
+ * any values which the user may have set. This property is only used to
+ * parameterize the Basic security policy used by the Network Server.
+ * This property is the port number which the server listens to.
+ */
+ public static final String DERBY_SECURITY_PORT = "derby.security.port";
+
/*
** derby.storage.*
*/
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy Fri May 16 00:44:17 2014
@@ -92,8 +92,9 @@ grant codeBase "${derbyTesting.codejar}d
// accept is needed for the server accepting connections
// connect is needed for ping command (which is in the server jar)
+ // listen is needed for the server listening on the network port
permission java.net.SocketPermission "127.0.0.1", "accept,connect";
- permission java.net.SocketPermission "localhost", "accept,connect";
+ permission java.net.SocketPermission "localhost", "accept,connect,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "accept,connect";
@@ -171,6 +172,9 @@ grant codeBase "${derbyTesting.testjar}d
permission java.lang.RuntimePermission "setSecurityManager";
permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
+
+ // Needed by NetworkServerTestSetup when probing ports.
+ permission java.net.SocketPermission "localhost", "listen";
};
//
@@ -197,7 +201,7 @@ grant codeBase "${derbyTesting.codeclass
// combination of client and server side.
permission java.net.SocketPermission "127.0.0.1", "accept,connect,resolve";
- permission java.net.SocketPermission "localhost", "accept,connect,resolve";
+ permission java.net.SocketPermission "localhost", "accept,connect,resolve,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy Fri May 16 00:44:17 2014
@@ -88,8 +88,9 @@ grant codeBase "${derbyTesting.codejar}d
// accept is needed for the server accepting connections
// connect is needed for ping command (which is in the server jar)
+ // listen is needed for the server listening on the network port
permission java.net.SocketPermission "127.0.0.1", "accept,connect";
- permission java.net.SocketPermission "localhost", "accept,connect";
+ permission java.net.SocketPermission "localhost", "accept,connect,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "accept,connect";
//tracing testing. NetworkServerControlApiTest
@@ -163,6 +164,9 @@ grant codeBase "${derbyTesting.testjar}d
permission java.lang.RuntimePermission "setSecurityManager";
permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
+
+ // Needed by NetworkServerTestSetup when probing ports.
+ permission java.net.SocketPermission "localhost", "listen";
};
//
@@ -186,7 +190,7 @@ grant codeBase "${derbyTesting.codeclass
// combination of client and server side.
permission java.net.SocketPermission "127.0.0.1", "accept,connect,resolve";
- permission java.net.SocketPermission "localhost", "accept,connect,resolve";
+ permission java.net.SocketPermission "localhost", "accept,connect,resolve,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy Fri May 16 00:44:17 2014
@@ -92,8 +92,9 @@ grant codeBase "${derbyTesting.codejar}d
// accept is needed for the server accepting connections
// connect is needed for ping command (which is in the server jar)
+ // listen is needed for the server listening on the network port
permission java.net.SocketPermission "127.0.0.1", "accept,connect";
- permission java.net.SocketPermission "localhost", "accept,connect";
+ permission java.net.SocketPermission "localhost", "accept,connect,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "accept,connect";
@@ -171,6 +172,9 @@ grant codeBase "${derbyTesting.testjar}d
permission java.lang.RuntimePermission "setSecurityManager";
permission java.security.SecurityPermission "getPolicy";
permission java.lang.RuntimePermission "setIO";
+
+ // Needed by NetworkServerTestSetup when probing ports.
+ permission java.net.SocketPermission "localhost", "listen";
};
//
@@ -197,7 +201,7 @@ grant codeBase "${derbyTesting.codeclass
// combination of client and server side.
permission java.net.SocketPermission "127.0.0.1", "accept,connect,resolve";
- permission java.net.SocketPermission "localhost", "accept,connect,resolve";
+ permission java.net.SocketPermission "localhost", "accept,connect,resolve,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy Fri May 16 00:44:17 2014
@@ -137,10 +137,12 @@ grant codeBase "${derbyTesting.codejar}d
// accept is needed for the server accepting connections
// connect is needed for ping command (which is in the server jar)
+ // listen is needed for the server listening on the network port
permission java.net.SocketPermission "127.0.0.1", "accept,connect";
- permission java.net.SocketPermission "localhost", "accept,connect";
+ permission java.net.SocketPermission "localhost", "accept,connect,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "accept,connect";
+
// Need to be able to write to trace file for NetworkServerControlApiTest
permission java.io.FilePermission "${user.dir}${/}system${/}trace${/}-", "write";
// Needed for NetworkServerMBean access (see JMX section above)
@@ -245,6 +247,9 @@ grant codeBase "${derbyTesting.testjar}d
//client side: test execs another jvm with relative path
permission java.io.FilePermission "<<ALL FILES>>", "execute";
+
+ // Needed by NetworkServerTestSetup when probing ports.
+ permission java.net.SocketPermission "localhost", "listen";
};
//
@@ -276,7 +281,7 @@ grant codeBase "${derbyTesting.codeclass
// combination of client and server side.
permission java.net.SocketPermission "127.0.0.1", "accept,connect,resolve";
- permission java.net.SocketPermission "localhost", "accept,connect,resolve";
+ permission java.net.SocketPermission "localhost", "accept,connect,resolve,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy?rev=1595085&r1=1595084&r2=1595085&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy Fri May 16 00:44:17 2014
@@ -1,5 +1,5 @@
//
-// * Derby - Class org.apache.derbyTesting.functionTests.tests.lang.SimpleTest
+// * Derby - Class org.apache.derbyTesting.functionTests.util.derby_tests.policy
// *
// * Licensed to the Apache Software Foundation (ASF) under one
// * or more contributor license agreements. See the NOTICE file
@@ -129,8 +129,9 @@ grant codeBase "${derbyTesting.codejar}d
// accept is needed for the server accepting connections
// connect is needed for ping command (which is in the server jar)
+ // listen is needed for the server listening on the network port
permission java.net.SocketPermission "127.0.0.1", "accept,connect";
- permission java.net.SocketPermission "localhost", "accept,connect";
+ permission java.net.SocketPermission "localhost", "accept,connect,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "accept,connect";
@@ -228,6 +229,9 @@ grant codeBase "${derbyTesting.testjar}d
// These permissions are needed when testing code instrumented with EMMA.
permission java.lang.RuntimePermission "${emma.active}writeFileDescriptor";
+
+ // Needed by NetworkServerTestSetup when probing ports
+ permission java.net.SocketPermission "localhost", "listen";
};
//
@@ -255,7 +259,7 @@ grant codeBase "${derbyTesting.codeclass
// combination of client and server side.
permission java.net.SocketPermission "127.0.0.1", "accept,connect,resolve";
- permission java.net.SocketPermission "localhost", "accept,connect,resolve";
+ permission java.net.SocketPermission "localhost", "accept,connect,resolve,listen";
permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
Propchange: db/derby/code/branches/10.4/maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/maven:1554997
+/db/derby/code/branches/10.5/maven:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/maven:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/maven:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/maven:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/maven:1491566,1556068
+/db/derby/code/trunk/maven:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,9618
92,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/plugins:1554997
+/db/derby/code/branches/10.5/plugins:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/plugins:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/plugins:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/plugins:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/plugins:1491566,1556068
+/db/derby/code/trunk/plugins:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,96
1892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/published_api_overview.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/published_api_overview.html:1554997
+/db/derby/code/branches/10.5/published_api_overview.html:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/published_api_overview.html:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/published_api_overview.html:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/published_api_overview.html:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/published_api_overview.html:1491566,1556068
+/db/derby/code/trunk/published_api_overview.html:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958
230,958618,959550,961892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/releaseSummary.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/releaseSummary.xml:1554997
+/db/derby/code/branches/10.5/releaseSummary.xml:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/releaseSummary.xml:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/releaseSummary.xml:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/releaseSummary.xml:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/releaseSummary.xml:1491566,1556068
+/db/derby/code/trunk/releaseSummary.xml:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,95861
8,959550,961892,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081
Propchange: db/derby/code/branches/10.4/tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 16 00:44:17 2014
@@ -0,0 +1,7 @@
+/db/derby/code/branches/10.10/tools:1554997
+/db/derby/code/branches/10.5/tools:814216,904472,958230,1132842,1132844,1337032,1541327,1556909
+/db/derby/code/branches/10.6/tools:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470,1365674,1541319,1556796
+/db/derby/code/branches/10.7/tools:1294731,1303263,1304465,1336809,1383996,1386854,1389677,1533412,1541311,1556368
+/db/derby/code/branches/10.8/tools:1136020,1209227-1209228,1209284,1337258,1556267
+/db/derby/code/branches/10.9/tools:1491566,1556068
+/db/derby/code/trunk/tools:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788436,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,934996,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954544,954748,955001,955634,956075,956445,956659,957260,958163,958230,958618,959550,9618
92,962716,964039,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1005347,1021426,1024511,1024528,1025615,1025795,1028633,1030043,1031559,1040658,1041374,1042537,1053724,1055169,1057542,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1096991,1130077,1130084,1133752,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512,1329359,1335570,1335677,1553081