diff options
| -rw-r--r-- | javae/test/IceE/adapterDeactivation/config | 10 | ||||
| -rw-r--r-- | javae/test/IceE/exceptions/config | 10 | ||||
| -rw-r--r-- | javae/test/IceE/facets/config | 10 | ||||
| -rw-r--r-- | javae/test/IceE/faultTolerance/config | 15 | ||||
| -rw-r--r-- | javae/test/IceE/inheritance/config | 10 | ||||
| -rw-r--r-- | javae/test/IceE/location/config | 12 | ||||
| -rw-r--r-- | javae/test/IceE/operations/config | 11 | ||||
| -rw-r--r-- | javae/test/IceE/package/config | 10 | ||||
| -rw-r--r-- | javae/test/IceE/slicing/config | 10 | ||||
| -rw-r--r-- | javae/test/IceE/slicing/ssrc/Server.java | 6 |
10 files changed, 49 insertions, 55 deletions
diff --git a/javae/test/IceE/adapterDeactivation/config b/javae/test/IceE/adapterDeactivation/config index 602319b8972..8ebff6ed2e8 100644 --- a/javae/test/IceE/adapterDeactivation/config +++ b/javae/test/IceE/adapterDeactivation/config @@ -7,11 +7,9 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Test.Proxy=test:default -p 12345 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 10000
\ No newline at end of file diff --git a/javae/test/IceE/exceptions/config b/javae/test/IceE/exceptions/config index 5e49caf59c4..aece7d6df64 100644 --- a/javae/test/IceE/exceptions/config +++ b/javae/test/IceE/exceptions/config @@ -7,11 +7,9 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Test.Proxy = thrower:default -p 12345 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 10000
\ No newline at end of file diff --git a/javae/test/IceE/facets/config b/javae/test/IceE/facets/config index 13fc7ad6909..4e60c6692c0 100644 --- a/javae/test/IceE/facets/config +++ b/javae/test/IceE/facets/config @@ -7,11 +7,9 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Test.Proxy=d:default -p 12345 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 10000
\ No newline at end of file diff --git a/javae/test/IceE/faultTolerance/config b/javae/test/IceE/faultTolerance/config index 48c9fef980a..18a25bcb0ae 100644 --- a/javae/test/IceE/faultTolerance/config +++ b/javae/test/IceE/faultTolerance/config @@ -7,12 +7,17 @@ # # ********************************************************************** +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. # -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The server portion of this test is currently not implemented as MIDlets. + +# The client MIDlet generates a list of proxies using a target hostname +# (Test.Host), a 'starting port' (Test.FirstPort), and the number of +# faultTolerance test servers to be tested against (Test.ServerCount). The test +# servers must all be running on the same host and must be running on ports in +# the range Test.FirstPort to Test.FirstPort + Test.ServerCount. # # Set Test.Host to the hostname or IP address for the server host. diff --git a/javae/test/IceE/inheritance/config b/javae/test/IceE/inheritance/config index 31cc543380d..6deb330cbe6 100644 --- a/javae/test/IceE/inheritance/config +++ b/javae/test/IceE/inheritance/config @@ -7,11 +7,9 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Test.Proxy=initial:default -p 12345 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 10000
\ No newline at end of file diff --git a/javae/test/IceE/location/config b/javae/test/IceE/location/config index 8d9a45d74ae..d9572c3c8b1 100644 --- a/javae/test/IceE/location/config +++ b/javae/test/IceE/location/config @@ -7,11 +7,11 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. + Ice.Default.Locator=locator:default -p 12345 +ServerManagerAdapter.Endpoints=default -p 12345 -t 30000 + Ice.RetryIntervals = 0 0 diff --git a/javae/test/IceE/operations/config b/javae/test/IceE/operations/config index d0559a5ca79..e1732b01aa5 100644 --- a/javae/test/IceE/operations/config +++ b/javae/test/IceE/operations/config @@ -7,13 +7,10 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Ice.MessageSizeMax = 100 Test.Proxy=test:default -p 12345 -t 10000 -Test.ProxyWithContext=test:default -p 12346 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 10000
\ No newline at end of file diff --git a/javae/test/IceE/package/config b/javae/test/IceE/package/config index 31cc543380d..6deb330cbe6 100644 --- a/javae/test/IceE/package/config +++ b/javae/test/IceE/package/config @@ -7,11 +7,9 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Test.Proxy=initial:default -p 12345 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 10000
\ No newline at end of file diff --git a/javae/test/IceE/slicing/config b/javae/test/IceE/slicing/config index 3f8988a97fb..4f7c5057231 100644 --- a/javae/test/IceE/slicing/config +++ b/javae/test/IceE/slicing/config @@ -7,11 +7,9 @@ # # ********************************************************************** -# -# TODO: We need a good description of what needs to be done here. Either that -# or MIDlets could use a different sort of configuration for proxies, such as -# separate entries for host, port and timeout and the proxy is constructed out -# of that. For a MIDlet, the hostname almost certainly needs to be specified. -# +# The MIDlet version of the Ice-E tests use this configuration file to +# configure proxies and endpoints. Modify the properties listed below as +# appropriate for the network configuration for your test. Test.Proxy=Test:default -p 12345 -t 10000 +TestAdapter.Endpoints=default -p 12345 -t 2000 diff --git a/javae/test/IceE/slicing/ssrc/Server.java b/javae/test/IceE/slicing/ssrc/Server.java index 641e27c828c..ffbcc08978c 100644 --- a/javae/test/IceE/slicing/ssrc/Server.java +++ b/javae/test/IceE/slicing/ssrc/Server.java @@ -14,7 +14,11 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000"); + if(properties.getProperty("TestAdapter.Endpoints").length() == 0) + { + properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000"); + } + Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(adapter); adapter.add(object, Ice.Util.stringToIdentity("Test")); |