yoavs 2005/07/26 17:36:26
Modified: catalina/src/share/org/apache/catalina/ant/jmx
JMXAccessorCondition.java
JMXAccessorEqualsCondition.java
JMXAccessorTask.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java ReplicationTransmitter.java
Log:
Minor JavaDoc fixes.
Revision Changes Path
1.4 +18 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
Index: JMXAccessorCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorCondition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMXAccessorCondition.java 1 Jul 2005 18:54:13 -0000 1.3
+++ JMXAccessorCondition.java 27 Jul 2005 00:36:26 -0000 1.4
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002,2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.catalina.ant.jmx;
import java.io.IOException;
@@ -287,7 +303,7 @@
/**
* Get value from MBeans attribute
- * @return
+ * @return The value
*/
protected String accessJMXValue() {
try {
1.4 +18 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
Index: JMXAccessorEqualsCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMXAccessorEqualsCondition.java 30 Jun 2005 13:15:13 -0000 1.3
+++ JMXAccessorEqualsCondition.java 27 Jul 2005 00:36:26 -0000 1.4
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002,2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.catalina.ant.jmx;
import java.io.IOException;
@@ -201,7 +217,7 @@
}
/**
- * @return
+ * @return The value
*/
protected String accessJMXValue() {
try {
1.11 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java
Index: JMXAccessorTask.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMXAccessorTask.java 22 Jul 2005 11:39:08 -0000 1.10
+++ JMXAccessorTask.java 27 Jul 2005 00:36:26 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation.
+ * Copyright 2002,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -421,7 +421,7 @@
/**
* Get Current Connection from <em>ref</em> parameter or create a new
one!
*
- * @return
+ * @return The server connection
* @throws MalformedURLException
* @throws IOException
*/
1.16 +4 -5
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Index: DataSender.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DataSender.java 16 Jul 2005 21:02:17 -0000 1.15
+++ DataSender.java 27 Jul 2005 00:36:26 -0000 1.16
@@ -554,8 +554,7 @@
/**
* disconnect and close socket
*
- * @see org.apache.catalina.cluster.tcp.IDataSender#disconnect()
- * @see DataSender#closeSocket()
+ * @see IDataSender#disconnect()
*/
public synchronized void disconnect() {
boolean connect = isConnected() ;
@@ -674,7 +673,7 @@
* close socket
*
* @see DataSender#disconnect()
- * @see DataSender#checkIfCloseSocket()
+ * @see DataSender#closeSocket()
*/
protected void closeSocket() {
if(isConnected()) {
@@ -747,7 +746,7 @@
*
* WARNING: Subclasses must be very carefull that only one thread call
this pushMessage at once!!!
*
- * @see #checkIfCloseSocket()
+ * @see #closeSocket()
* @see #openSocket()
* @see #writeData(byte[])
*
1.37 +2 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Index: ReplicationTransmitter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ReplicationTransmitter.java 8 Jul 2005 20:50:30 -0000 1.36
+++ ReplicationTransmitter.java 27 Jul 2005 00:36:26 -0000 1.37
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
not
* use this file except in compliance with the License. You may obtain a
copy of
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
