Author: myrnavl
Date: Mon Nov 21 19:55:09 2011
New Revision: 1204670
URL: http://svn.apache.org/viewvc?rev=1204670&view=rev
Log:
DERBY-5509; javadoc for NetServlet and NetworkServerControl are missing a few closing tags
backport (merge) of revision 1204128 from trunk adds the missing closing tags.
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetServlet.java
db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetworkServerControl.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 21 19:55:09 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,1186020,1186691,1189201,1189222,1203252
+/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,1186020,1186691,1189201,1189222,1203252,1204128
Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetServlet.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetServlet.java?rev=1204670&r1=1204669&r2=1204670&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetServlet.java Mon Nov 21 19:55:09 2011
@@ -40,10 +40,10 @@ import org.apache.derby.iapi.reference.P
These servlet configuration parameters are understood by this servlet.
- portNumber
- Port number to use. The default is 1527.
+ portNumber
- Port number to use. The default is 1527.startNetworkServerOnInit
- Starts the Derby Network Server at servlet
- initialization if 'true'.
- tracingDirectory
- Directory for trace files
+ initialization if 'true'.tracingDirectory
- Directory for trace files
*/
@@ -75,10 +75,10 @@ public class NetServlet extends HttpServ
Initialize the servlet.
Configuration parameters:
- portNumber
- Port number
- host
- Host name
- traceDirectory
- location of trace directory
- startNetworkServerOnInit
- start the server on initialization
+ portNumber
- Port numberhost
- Host nametraceDirectory
- location of trace directorystartNetworkServerOnInit
- start the server on initialization
*/
public void init(ServletConfig config)
Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=1204670&r1=1204669&r2=1204670&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/drda/NetworkServerControl.java Mon Nov 21 19:55:09 2011
@@ -59,6 +59,7 @@ import org.apache.derby.impl.drda.Networ
sysinfo [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This prints
classpath and version information about the Network Server,
the JVM and the Derby engine.
+
runtimeinfo [-h <host] [-p <portnumber] [-ssl <sslmode>]: This prints
extensive debbugging information about sessions, threads,
@@ -94,6 +95,7 @@ import org.apache.derby.impl.drda.Networ
Otherwise the default is the current directory.
+
Properties can be set in the derby.properties file or on the command line.
Properties on the command line take precedence over properties in the
derby.properties file. Arguments on the command line take precedence
@@ -105,7 +107,7 @@ import org.apache.derby.impl.drda.Networ
indicates which port should be used for the Network Server.
derby.drda.host=<host name or ip address >: This property
- indicates the ip address to which NetworkServerControl should connect
+ indicates the ip address to which NetworkServerControl should connect.
derby.drda.traceDirectory=<trace directory>: This property
indicates where to put trace files.
@@ -136,18 +138,22 @@ import org.apache.derby.impl.drda.Networ
mode of the server.
+
+
-Examples.
+
Examples.
This is an example of shutting down the server on port 1621.
java org.apache.derby.drda.NetworkServerControl shutdown -p 1621
+
This is an example of turning tracing on for session 3
java org.apache.derby.drda.NetworkServerControl trace on -s 3
+
This is an example of starting and then shutting down the network
server on port 1621 on machine myhost
@@ -155,6 +161,7 @@ import org.apache.derby.impl.drda.Networ
java org.apache.derby.drda.NetworkServerControl start -h myhost -p 1621
java org.apache.derby.drda.NetworkServerControl shutdown -h myhost -p 1621
+
This is an example of starting and shutting down the Network Server in the example
above with the API.
@@ -164,6 +171,7 @@ import org.apache.derby.impl.drda.Networ
serverControl.shutdown();
+
*/
@@ -233,12 +241,14 @@ public class NetworkServerControl{
* a Network Server on a specified port and InetAddress.
*
* Examples:
+ *
*
* To configure for port 1621 and listen on the loopback address:
*
* NetworkServerControl util = new
* NetworkServerControl(InetAddress.getByName("localhost"), 1621);
*
+ *
*
* @param address The IP address of the Network Server host.
* address cannot be null.
@@ -267,6 +277,7 @@ public class NetworkServerControl{
*
* new NetworkServerControl(InetAddress.getByName("localhost"),1527);
*
+ *
*
* @throws Exception on error
*/
@@ -355,6 +366,7 @@ public class NetworkServerControl{
* Note: an alternate method to starting the Network Server with the API,
* is to use the derby.drda.startNetworkServer property in
* derby.properties.
+ *
*
*
* @param consoleWriter PrintWriter to which server console will be