Author: rjung
Date: Sun Feb 3 10:40:01 2013
New Revision: 1441887
URL: http://svn.apache.org/viewvc?rev=1441887&view=rev
Log:
Use default port 8023 instead of 23 in echo
server example.
Examples and tests should not assume a
privileged user runs them.
Backport of r1441886 from tcnative trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/TODO.txt
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.properties
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
Merged /tomcat/native/trunk:r1441886
Modified: tomcat/native/branches/1.1.x/TODO.txt
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1441887&r1=1441886&r2=1441887&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/TODO.txt (original)
+++ tomcat/native/branches/1.1.x/TODO.txt Sun Feb 3 10:40:01 2013
@@ -41,11 +41,6 @@ Java Tests and Examples
- No mentioning of running "ant download" before tests. Without
it test compilation fails.
-- "ant run-echo": will fail, because by default uses privileged
- port 23. Maybe switch to 8023 as a default?
- Users should not run tests as root and on most systems the default
- port should just work.
-
- "ant run-echo": what is the expected behaviour of this example.
I couldn't get it to do something understandable.
Document the example in the README.txt.
Modified: tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java?rev=1441887&r1=1441886&r2=1441887&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java
(original)
+++ tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java Sun
Feb 3 10:40:01 2013
@@ -49,7 +49,7 @@ public class Echo {
props.load(is);
is.close();
echoAddr = props.getProperty("echo.ip", "127.0.0.1");
- echoPort = Integer.decode(props.getProperty("echo.port",
"23")).intValue();
+ echoPort = Integer.decode(props.getProperty("echo.port",
"8023")).intValue();
echoNmax = Integer.decode(props.getProperty("echo.max",
"1")).intValue();
}
catch (Throwable t) {
Modified:
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.properties
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.properties?rev=1441887&r1=1441886&r2=1441887&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.properties
(original)
+++ tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.properties
Sun Feb 3 10:40:01 2013
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Telnet properties
-echo.port=23
+# Test port used for echo server
+echo.port=8023
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
