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 kr...@apache.org on 2011/10/20 11:44:04 UTC
svn commit: r1186697 - in /db/derby/code/branches/10.8: ./ build.xml
java/client/org/apache/derby/client/net/NetCursor.java
Author: kristwaa
Date: Thu Oct 20 09:44:03 2011
New Revision: 1186697
URL: http://svn.apache.org/viewvc?rev=1186697&view=rev
Log:
DERBY-5476: Copyright notice in the API documentation (generated by the Javadoc tool) is outdated
Merged fix from trunk (revision 1186691).
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/build.xml
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 09:44:03 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,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
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,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,1186691
Modified: db/derby/code/branches/10.8/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/build.xml?rev=1186697&r1=1186696&r2=1186697&view=diff
==============================================================================
--- db/derby/code/branches/10.8/build.xml (original)
+++ db/derby/code/branches/10.8/build.xml Thu Oct 20 09:44:03 2011
@@ -1078,7 +1078,7 @@
Windowtitle="Apache Derby ${major}.${minor} API Documentation"
Header="Apache Derby ${major}.${minor}"
Footer="${javadoc.Footer}"
- bottom="Apache Derby ${major}.${minor} API Documentation - <i>Copyright &copy; 2004,2008 The Apache Software Foundation. All Rights Reserved.</i>">
+ bottom="Apache Derby ${major}.${minor} API Documentation - <i>Copyright &copy; 2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.</i>">
<Doctitle> Apache Derby ${major}.${minor} API Documentation</Doctitle>
<fileset dir="${derby.engine.src.dir}"
includesfile="${javadoc.inclusions}"/>
@@ -1129,7 +1129,7 @@
windowtitle="Apache Derby V${major}.${minor} Internals"
doctitle="Apache Derby V${major}.${minor} Internals"
Footer="${javadoc.Footer}"
- bottom="Apache Derby V${major}.${minor} Internals - <i>Copyright &copy; 2004,2007 The Apache Software Foundation. All Rights Reserved.</i>">
+ bottom="Apache Derby V${major}.${minor} Internals - <i>Copyright &copy; 2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.</i>">
<taglet name="org.apache.derbyBuild.javadoc.FormatIdTaglet"
path="${basedir}/classes"/>
<taglet name="org.apache.derbyBuild.javadoc.PurposeTaglet"
@@ -1260,7 +1260,7 @@
windowtitle="Apache Derby V${major}.${minor} Test Javadoc"
doctitle="Apache Derby V${major}.${minor} Test Javadoc"
Footer="${javadoc.Footer}"
- bottom="Apache Derby V${major}.${minor} Internals - <i>Copyright &copy; 2004,2008 The Apache Software Foundation. All Rights Reserved.</i>"
+ bottom="Apache Derby V${major}.${minor} Internals - <i>Copyright &copy; 2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.</i>"
source="1.5"
sourcepath="${derby.testing.src.dir}"
/>
Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 09:44:03 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7/java/client/org/apache/derby/client/net/NetCursor.java:1061570,1061578,1082235
-/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,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,1145961,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,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
180790,1180858,1181756,1183463,1183671
+/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,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,1145961,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,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
180790,1180858,1181756,1183463,1183671,1186691