diff options
Diffstat (limited to 'java')
68 files changed, 182 insertions, 181 deletions
diff --git a/java/examples/Logger/simple-server/LoggingAcceptor.java b/java/examples/Logger/simple-server/LoggingAcceptor.java index 4c928471c52..7925e3d5a15 100644 --- a/java/examples/Logger/simple-server/LoggingAcceptor.java +++ b/java/examples/Logger/simple-server/LoggingAcceptor.java @@ -1,6 +1,6 @@ //package ACE.SimpleLogger; -import ACE.SOCK_SAP.*; +import JACE.SOCK_SAP.*; import java.io.IOException; public class LoggingAcceptor extends Thread diff --git a/java/examples/Logger/simple-server/LoggingClient.java b/java/examples/Logger/simple-server/LoggingClient.java index 9fe14e44284..3c8a7fe3a2e 100644 --- a/java/examples/Logger/simple-server/LoggingClient.java +++ b/java/examples/Logger/simple-server/LoggingClient.java @@ -4,7 +4,7 @@ import java.io.*; import java.net.*; -import ACE.SOCK_SAP.*; +import JACE.SOCK_SAP.*; import LogRecord; import LoggerConstants; diff --git a/java/examples/Logger/simple-server/LoggingHandler.java b/java/examples/Logger/simple-server/LoggingHandler.java index 3861af246c5..aeffc991ac3 100644 --- a/java/examples/Logger/simple-server/LoggingHandler.java +++ b/java/examples/Logger/simple-server/LoggingHandler.java @@ -12,7 +12,7 @@ //package ACE.SimpleLogger; -import ACE.SOCK_SAP.*; +import JACE.SOCK_SAP.*; import java.util.*; import java.io.*; diff --git a/java/src/ACE.java b/java/src/ACE.java index 4e558fe4609..8fa6e1823fa 100644 --- a/java/src/ACE.java +++ b/java/src/ACE.java @@ -1,15 +1,15 @@ /************************************************* * * = PACKAGE - * ACE.OS + * JACE.OS * * = FILENAME - * ACE.java + * JACE.java * *@author Prashant Jain * *************************************************/ -package ACE.OS; +package JACE.OS; /** * <hr> diff --git a/java/src/AcceptStrategy.java b/java/src/AcceptStrategy.java index cf35c4fb460..7b48510840e 100644 --- a/java/src/AcceptStrategy.java +++ b/java/src/AcceptStrategy.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * AcceptStrategy.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; import java.io.*; import java.net.*; -import ACE.SOCK_SAP.*; +import JACE.SOCK_SAP.*; /** * <hr> diff --git a/java/src/Acceptor.java b/java/src/Acceptor.java index b47b0dcf875..4a47d743e98 100644 --- a/java/src/Acceptor.java +++ b/java/src/Acceptor.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * Acceptor.java @@ -9,13 +9,13 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.SOCK_SAP.*; -import ACE.ServiceConfigurator.*; +import JACE.OS.*; +import JACE.SOCK_SAP.*; +import JACE.ServiceConfigurator.*; /** * <hr> diff --git a/java/src/ActivateStrategy.java b/java/src/ActivateStrategy.java index 9cff685f3ba..882203ad552 100644 --- a/java/src/ActivateStrategy.java +++ b/java/src/ActivateStrategy.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * ActivateStrategy.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; /** diff --git a/java/src/Condition.java b/java/src/Condition.java index 17acf228346..59a97c9a1a7 100644 --- a/java/src/Condition.java +++ b/java/src/Condition.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Concurrency + * JACE.Concurrency * * = FILENAME * Condition.java @@ -9,10 +9,10 @@ *@author Irfan Pyarali * *************************************************/ -package ACE.Concurrency; +package JACE.Concurrency; -import ACE.ASX.TimeoutException; -import ACE.ASX.TimeValue; +import JACE.ASX.TimeoutException; +import JACE.ASX.TimeValue; /** * <hr> diff --git a/java/src/Connector.java b/java/src/Connector.java index 337d360bede..81b701e7b4d 100644 --- a/java/src/Connector.java +++ b/java/src/Connector.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * Connector.java @@ -9,13 +9,13 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.SOCK_SAP.*; -import ACE.ServiceConfigurator.*; +import JACE.OS.*; +import JACE.SOCK_SAP.*; +import JACE.ServiceConfigurator.*; /** * <hr> diff --git a/java/src/CreationStrategy.java b/java/src/CreationStrategy.java index 787e0c22c24..219dc712668 100644 --- a/java/src/CreationStrategy.java +++ b/java/src/CreationStrategy.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * CreationStrategy.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; /** * <hr> diff --git a/java/src/EventHandler.java b/java/src/EventHandler.java index e45b3fb8899..53a9974bf08 100644 --- a/java/src/EventHandler.java +++ b/java/src/EventHandler.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Reactor + * JACE.Reactor * * = FILENAME * EventHandler.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.Reactor; +package JACE.Reactor; -import ACE.ASX.TimeValue; +import JACE.ASX.TimeValue; /** * <hr> diff --git a/java/src/GetOpt.java b/java/src/GetOpt.java index 5060d7f8b94..2bf5d27c406 100644 --- a/java/src/GetOpt.java +++ b/java/src/GetOpt.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Misc + * JACE.Misc * * = FILENAME * GetOpt.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.Misc; +package JACE.Misc; import java.io.*; import java.util.Hashtable; diff --git a/java/src/INETAddr.java b/java/src/INETAddr.java index d749e200658..8d16c46c6b3 100644 --- a/java/src/INETAddr.java +++ b/java/src/INETAddr.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.SOCK_SAP + * JACE.SOCK_SAP * * = FILENAME * INETAddr.java @@ -9,11 +9,11 @@ *@author Chris Cleeland * *************************************************/ -package ACE.SOCK_SAP; +package JACE.SOCK_SAP; import java.io.*; import java.net.*; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/IOCntlCmds.java b/java/src/IOCntlCmds.java index 9512a02bc35..2469428a3a6 100644 --- a/java/src/IOCntlCmds.java +++ b/java/src/IOCntlCmds.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * TaskFlags.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; public abstract class IOCntlCmds { diff --git a/java/src/IOCntlMsg.java b/java/src/IOCntlMsg.java index ba800a96f91..8b69310c4f7 100644 --- a/java/src/IOCntlMsg.java +++ b/java/src/IOCntlMsg.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * IOCntlMsg.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/MessageBlock.java b/java/src/MessageBlock.java index 6f81f279291..1741f9bef80 100644 --- a/java/src/MessageBlock.java +++ b/java/src/MessageBlock.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * MessageBlock.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/MessageQueue.java b/java/src/MessageQueue.java index fe3e274fd6d..f71c91ca857 100644 --- a/java/src/MessageQueue.java +++ b/java/src/MessageQueue.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * MessageQueue.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; import java.util.Date; -import ACE.OS.*; -import ACE.Reactor.*; +import JACE.OS.*; +import JACE.Reactor.*; class NotFullCondition extends TimedWait { diff --git a/java/src/MessageType.java b/java/src/MessageType.java index 2443ec38a67..62c34455854 100644 --- a/java/src/MessageType.java +++ b/java/src/MessageType.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * MessageType.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; /** * <hr> diff --git a/java/src/Module.java b/java/src/Module.java index d3ecae2c67c..6eb56bcbf43 100644 --- a/java/src/Module.java +++ b/java/src/Module.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * Module.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/Mutex.java b/java/src/Mutex.java index ba1e13882ae..8daab4ff9eb 100644 --- a/java/src/Mutex.java +++ b/java/src/Mutex.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Concurrency + * JACE.Concurrency * * = FILENAME * Mutex.java @@ -9,10 +9,10 @@ *@author Prashant Jain * *************************************************/ -package ACE.Concurrency; +package JACE.Concurrency; import java.util.*; -import ACE.ASX.*; +import JACE.ASX.*; class TimedWaitMAdapter extends TimedWait { diff --git a/java/src/OS.java b/java/src/OS.java index 3c762a059e6..c17fd6d07f2 100644 --- a/java/src/OS.java +++ b/java/src/OS.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.OS + * JACE.OS * * = FILENAME * OS.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.OS; +package JACE.OS; import java.util.StringTokenizer; diff --git a/java/src/ProfileTimer.java b/java/src/ProfileTimer.java index 6ce0d7ae811..b7e9c908a13 100644 --- a/java/src/ProfileTimer.java +++ b/java/src/ProfileTimer.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Timers + * JACE.Timers * * = FILENAME * ProfileTimer.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.Timers; +package JACE.Timers; /** * <hr> diff --git a/java/src/RWMutex.java b/java/src/RWMutex.java index f3970690c4e..1161d9a8618 100644 --- a/java/src/RWMutex.java +++ b/java/src/RWMutex.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Concurrency + * JACE.Concurrency * * = FILENAME * RWMutex.java @@ -10,9 +10,9 @@ * *************************************************/ -package ACE.Concurrency; +package JACE.Concurrency; -import ACE.OS.*; +import JACE.OS.*; /******************************************************************************* * <HR> diff --git a/java/src/SOCKAcceptor.java b/java/src/SOCKAcceptor.java index a8e8f6d0994..aaca725426a 100644 --- a/java/src/SOCKAcceptor.java +++ b/java/src/SOCKAcceptor.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.SOCK_SAP + * JACE.SOCK_SAP * * = FILENAME * SOCKAcceptor.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.SOCK_SAP; +package JACE.SOCK_SAP; import java.io.*; import java.net.*; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/SOCKConnector.java b/java/src/SOCKConnector.java index fd1fcb6d685..98dfcaf6b3d 100644 --- a/java/src/SOCKConnector.java +++ b/java/src/SOCKConnector.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.SOCK_SAP + * JACE.SOCK_SAP * * = FILENAME * SOCKConnector.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.SOCK_SAP; +package JACE.SOCK_SAP; import java.io.*; import java.net.*; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/SOCKStream.java b/java/src/SOCKStream.java index 4aa0294550e..92029e6602d 100644 --- a/java/src/SOCKStream.java +++ b/java/src/SOCKStream.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.SOCK_SAP + * JACE.SOCK_SAP * * = FILENAME * SOCKStream.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.SOCK_SAP; +package JACE.SOCK_SAP; import java.io.*; import java.net.*; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/Semaphore.java b/java/src/Semaphore.java index 7e50dd80194..4762712d722 100644 --- a/java/src/Semaphore.java +++ b/java/src/Semaphore.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Concurrency + * JACE.Concurrency * * = FILENAME * Semaphore.java @@ -9,12 +9,12 @@ *@author Prashant Jain * *************************************************/ -package ACE.Concurrency; +package JACE.Concurrency; import java.util.*; -import ACE.ASX.*; +import JACE.ASX.*; -class TimedWaitSAdapter extends ACE.ASX.TimedWait +class TimedWaitSAdapter extends JACE.ASX.TimedWait { TimedWaitSAdapter (Object obj) { @@ -83,7 +83,7 @@ public class Semaphore *@exception InterruptedException exception during wait */ public synchronized void acquire (TimeValue tv) - throws ACE.ASX.TimeoutException, InterruptedException + throws JACE.ASX.TimeoutException, InterruptedException { this.monitor_.timedWait (tv); this.monitor_.decrement (); diff --git a/java/src/ServiceConfig.java b/java/src/ServiceConfig.java index 3cf97db7eae..74e8523d8c1 100644 --- a/java/src/ServiceConfig.java +++ b/java/src/ServiceConfig.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ServiceConfigurator + * JACE.ServiceConfigurator * * = FILENAME * ServiceConfig.java @@ -9,12 +9,12 @@ *@author Prashant Jain * *************************************************/ -package ACE.ServiceConfigurator; +package JACE.ServiceConfigurator; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.Misc.*; +import JACE.OS.*; +import JACE.Misc.*; /** * <hr> diff --git a/java/src/ServiceObject.java b/java/src/ServiceObject.java index 5d27c0f0d2f..56761f81267 100644 --- a/java/src/ServiceObject.java +++ b/java/src/ServiceObject.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ServiceConfigurator + * JACE.ServiceConfigurator * * = FILENAME * ServiceObject.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.ServiceConfigurator; +package JACE.ServiceConfigurator; import java.io.*; -import ACE.ASX.*; -import ACE.Reactor.*; +import JACE.ASX.*; +import JACE.Reactor.*; public class ServiceObject implements EventHandler { diff --git a/java/src/ServiceRepository.java b/java/src/ServiceRepository.java index e284679f458..de5e4384b7d 100644 --- a/java/src/ServiceRepository.java +++ b/java/src/ServiceRepository.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ServiceConfigurator + * JACE.ServiceConfigurator * * = FILENAME * ServiceRepository.java @@ -9,12 +9,12 @@ *@author Prashant Jain * *************************************************/ -package ACE.ServiceConfigurator; +package JACE.ServiceConfigurator; import java.io.*; import java.util.*; import java.net.*; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/StrategyAcceptor.java b/java/src/StrategyAcceptor.java index 2febad428fa..07f81a8ad63 100644 --- a/java/src/StrategyAcceptor.java +++ b/java/src/StrategyAcceptor.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * StrategyAcceptor.java @@ -9,12 +9,12 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.SOCK_SAP.*; +import JACE.OS.*; +import JACE.SOCK_SAP.*; public class StrategyAcceptor { diff --git a/java/src/Stream.java b/java/src/Stream.java index acb9a8856c8..030114d092f 100644 --- a/java/src/Stream.java +++ b/java/src/Stream.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * Stream.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/StreamHead.java b/java/src/StreamHead.java index 05fa6d4c179..37d9c2af0c3 100644 --- a/java/src/StreamHead.java +++ b/java/src/StreamHead.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * StreamHead.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/StreamTail.java b/java/src/StreamTail.java index 13415ba4c96..44f9dde6634 100644 --- a/java/src/StreamTail.java +++ b/java/src/StreamTail.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * StreamTail.java @@ -9,9 +9,9 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; +import JACE.OS.*; /** * <hr> diff --git a/java/src/SvcHandler.java b/java/src/SvcHandler.java index 39485dbf4e6..0ba7f671e0d 100644 --- a/java/src/SvcHandler.java +++ b/java/src/SvcHandler.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Connection + * JACE.Connection * * = FILENAME * SvcHandler.java @@ -9,13 +9,13 @@ *@author Prashant Jain * *************************************************/ -package ACE.Connection; +package JACE.Connection; import java.io.*; import java.net.*; -import ACE.SOCK_SAP.*; -import ACE.ASX.*; -import ACE.Reactor.*; +import JACE.SOCK_SAP.*; +import JACE.ASX.*; +import JACE.Reactor.*; public abstract class SvcHandler extends Task { diff --git a/java/src/Task.java b/java/src/Task.java index 1fc5e090d54..065e7869fef 100644 --- a/java/src/Task.java +++ b/java/src/Task.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * Task.java @@ -9,11 +9,11 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; -import ACE.OS.*; -import ACE.Reactor.*; -import ACE.Concurrency.*; +import JACE.OS.*; +import JACE.Reactor.*; +import JACE.Concurrency.*; public abstract class Task implements Runnable, EventHandler { diff --git a/java/src/TaskFlags.java b/java/src/TaskFlags.java index fdca5d20df6..590e514b5e2 100644 --- a/java/src/TaskFlags.java +++ b/java/src/TaskFlags.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * TaskFlags.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; public abstract class TaskFlags { diff --git a/java/src/ThreadManager.java b/java/src/ThreadManager.java index 6f5f48748a6..5043d26511e 100644 --- a/java/src/ThreadManager.java +++ b/java/src/ThreadManager.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Concurrency + * JACE.Concurrency * * = FILENAME * ThreadManager.java @@ -9,10 +9,10 @@ *@author Prashant Jain * *************************************************/ -package ACE.Concurrency; +package JACE.Concurrency; import java.util.*; -import ACE.OS.*; +import JACE.OS.*; public class ThreadManager { diff --git a/java/src/ThruTask.java b/java/src/ThruTask.java index fcfd42710c8..aebc8eb1f48 100644 --- a/java/src/ThruTask.java +++ b/java/src/ThruTask.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * ThruTask.java @@ -9,7 +9,7 @@ *@author Prashant Jain * *************************************************/ -package ACE.ASX; +package JACE.ASX; /** * <hr> diff --git a/java/src/TimeValue.java b/java/src/TimeValue.java index 018e64e17d3..280f45ab0f1 100644 --- a/java/src/TimeValue.java +++ b/java/src/TimeValue.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Reactor + * JACE.Reactor * * = FILENAME * TimeValue.java @@ -9,8 +9,8 @@ *@author Prashant Jain * *************************************************/ -//package ACE.Reactor; -package ACE.ASX; +//package JACE.Reactor; +package JACE.ASX; public class TimeValue { diff --git a/java/src/TimedWait.java b/java/src/TimedWait.java index 9efc23fbfe3..acf771dfca1 100644 --- a/java/src/TimedWait.java +++ b/java/src/TimedWait.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * TimedWait.java @@ -9,7 +9,7 @@ *@author Prashant Jain and Doug Schmidt * *************************************************/ -package ACE.ASX; +package JACE.ASX; public abstract class TimedWait { diff --git a/java/src/TimeoutException.java b/java/src/TimeoutException.java index 696d0ea2a58..b55549938dc 100644 --- a/java/src/TimeoutException.java +++ b/java/src/TimeoutException.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.ASX + * JACE.ASX * * = FILENAME * TimeoutException.java @@ -9,7 +9,7 @@ *@author Prashant Jain and Doug Schmidt * *************************************************/ -package ACE.ASX; +package JACE.ASX; public class TimeoutException extends Exception { diff --git a/java/src/TimerQueue.java b/java/src/TimerQueue.java index eeab38f9206..74bac5ec398 100644 --- a/java/src/TimerQueue.java +++ b/java/src/TimerQueue.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Reactor + * JACE.Reactor * * = FILENAME * TimerQueue.java @@ -9,10 +9,10 @@ *@author Prashant Jain * *************************************************/ -package ACE.Reactor; +package JACE.Reactor; import java.util.*; -import ACE.ASX.*; +import JACE.ASX.*; class TimerNode { diff --git a/java/src/Token.java b/java/src/Token.java index d02bd33f775..a17be013ad5 100644 --- a/java/src/Token.java +++ b/java/src/Token.java @@ -1,7 +1,7 @@ /************************************************* * * = PACKAGE - * ACE.Concurrency + * JACE.Concurrency * * = FILENAME * Token.java @@ -9,10 +9,10 @@ *@author Prashant Jain * *************************************************/ -package ACE.Concurrency; +package JACE.Concurrency; import java.util.*; -import ACE.ASX.*; +import JACE.ASX.*; class WaitObject extends TimedWait { diff --git a/java/tests/ASX/BufferStreamTest.java b/java/tests/ASX/BufferStreamTest.java index b431f78318f..9a696497562 100644 --- a/java/tests/ASX/BufferStreamTest.java +++ b/java/tests/ASX/BufferStreamTest.java @@ -13,8 +13,8 @@ package tests.ASX; import java.io.*; -import ACE.OS.*; -import ACE.ASX.*; +import JACE.OS.*; +import JACE.ASX.*; // This short program copies stdin to stdout via the use of an ASX // STREAM. It illustrates an implementation of the classic "bounded diff --git a/java/tests/ASX/MessageQueueTest.java b/java/tests/ASX/MessageQueueTest.java index 0dfc3428330..c22d2cf041d 100644 --- a/java/tests/ASX/MessageQueueTest.java +++ b/java/tests/ASX/MessageQueueTest.java @@ -13,8 +13,8 @@ package tests.ASX; import java.io.*; -import ACE.OS.*; -import ACE.ASX.*; +import JACE.OS.*; +import JACE.ASX.*; public class MessageQueueTest { diff --git a/java/tests/ASX/PriorityBufferTest.java b/java/tests/ASX/PriorityBufferTest.java index 79a3ffebfb2..5cce32fa3b1 100644 --- a/java/tests/ASX/PriorityBufferTest.java +++ b/java/tests/ASX/PriorityBufferTest.java @@ -13,8 +13,8 @@ package tests.ASX; import java.io.*; -import ACE.OS.*; -import ACE.ASX.*; +import JACE.OS.*; +import JACE.ASX.*; class consumer extends Thread { diff --git a/java/tests/ASX/TaskTest.java b/java/tests/ASX/TaskTest.java index a1958f2a8dc..b26b48ea148 100644 --- a/java/tests/ASX/TaskTest.java +++ b/java/tests/ASX/TaskTest.java @@ -13,9 +13,9 @@ package tests.ASX; import java.io.*; -import ACE.OS.*; -import ACE.ASX.*; -import ACE.Reactor.*; +import JACE.OS.*; +import JACE.ASX.*; +import JACE.Reactor.*; public class TaskTest extends Task { diff --git a/java/tests/ASX/ThreadPoolTest.java b/java/tests/ASX/ThreadPoolTest.java index 6367452131a..cfb20f87adb 100644 --- a/java/tests/ASX/ThreadPoolTest.java +++ b/java/tests/ASX/ThreadPoolTest.java @@ -13,9 +13,9 @@ package tests.ASX; import java.io.*; -import ACE.OS.*; -import ACE.ASX.*; -import ACE.Reactor.*; +import JACE.OS.*; +import JACE.ASX.*; +import JACE.Reactor.*; public class ThreadPoolTest extends Task { diff --git a/java/tests/Concurrency/Condition/Consumer.java b/java/tests/Concurrency/Condition/Consumer.java index de9c4061110..ff4f5ff4a4b 100644 --- a/java/tests/Concurrency/Condition/Consumer.java +++ b/java/tests/Concurrency/Condition/Consumer.java @@ -6,7 +6,7 @@ package tests.Concurrency.Condition; -import ACE.ASX.TimeValue; +import JACE.ASX.TimeValue; import java.util.Random; public class Consumer implements Runnable diff --git a/java/tests/Concurrency/Condition/Producer.java b/java/tests/Concurrency/Condition/Producer.java index a8b73ba7c16..ed6da2251ba 100644 --- a/java/tests/Concurrency/Condition/Producer.java +++ b/java/tests/Concurrency/Condition/Producer.java @@ -6,7 +6,7 @@ package tests.Concurrency.Condition; -import ACE.ASX.TimeValue; +import JACE.ASX.TimeValue; import java.util.Random; public class Producer implements Runnable diff --git a/java/tests/Concurrency/Condition/QueueTest.java b/java/tests/Concurrency/Condition/QueueTest.java index e733c3cc21e..87e7d57bbbd 100644 --- a/java/tests/Concurrency/Condition/QueueTest.java +++ b/java/tests/Concurrency/Condition/QueueTest.java @@ -7,7 +7,7 @@ package tests.Concurrency.Condition; -import ACE.ASX.TimeValue; +import JACE.ASX.TimeValue; public class QueueTest { diff --git a/java/tests/Concurrency/Condition/SimpleMessageQueue.java b/java/tests/Concurrency/Condition/SimpleMessageQueue.java index 5bdc22c0a72..bb703516858 100644 --- a/java/tests/Concurrency/Condition/SimpleMessageQueue.java +++ b/java/tests/Concurrency/Condition/SimpleMessageQueue.java @@ -1,8 +1,8 @@ package tests.Concurrency.Condition; -import ACE.ASX.TimeoutException; -import ACE.ASX.TimeValue; -import ACE.Concurrency.*; +import JACE.ASX.TimeoutException; +import JACE.ASX.TimeValue; +import JACE.Concurrency.*; public class SimpleMessageQueue { diff --git a/java/tests/Concurrency/MutexTest.java b/java/tests/Concurrency/MutexTest.java index 3241fab2a98..680266ef071 100644 --- a/java/tests/Concurrency/MutexTest.java +++ b/java/tests/Concurrency/MutexTest.java @@ -12,8 +12,8 @@ package tests.Concurrency; import java.io.*; -import ACE.OS.*; -import ACE.Concurrency.*; +import JACE.OS.*; +import JACE.Concurrency.*; class MutexReader extends Thread { diff --git a/java/tests/Concurrency/RWMutexTest.java b/java/tests/Concurrency/RWMutexTest.java index a46a95dab49..ab28c9a83fd 100644 --- a/java/tests/Concurrency/RWMutexTest.java +++ b/java/tests/Concurrency/RWMutexTest.java @@ -11,8 +11,8 @@ *************************************************/ package tests.Concurrency; -import ACE.OS.*; -import ACE.Concurrency.*; +import JACE.OS.*; +import JACE.Concurrency.*; class TestThread extends Thread { diff --git a/java/tests/Concurrency/SemaphoreTest.java b/java/tests/Concurrency/SemaphoreTest.java index 489f2cb0307..b45929daa55 100644 --- a/java/tests/Concurrency/SemaphoreTest.java +++ b/java/tests/Concurrency/SemaphoreTest.java @@ -12,8 +12,8 @@ package tests.Concurrency; import java.io.*; -import ACE.OS.*; -import ACE.Concurrency.*; +import JACE.OS.*; +import JACE.Concurrency.*; class SemaphoreWriter extends Thread { diff --git a/java/tests/Concurrency/TokenTest.java b/java/tests/Concurrency/TokenTest.java index a9b435d171d..ededed9fed9 100644 --- a/java/tests/Concurrency/TokenTest.java +++ b/java/tests/Concurrency/TokenTest.java @@ -12,8 +12,8 @@ package tests.Concurrency; import java.io.*; -import ACE.OS.*; -import ACE.Concurrency.*; +import JACE.OS.*; +import JACE.Concurrency.*; class MyToken extends Token { @@ -35,7 +35,7 @@ public class TokenTest implements Runnable ACE.DEBUG (Thread.currentThread () + " acquired token"); Thread.sleep (100); - this.token_.renew (0); + this.token_.renew (1); this.token_.release (); ACE.DEBUG (Thread.currentThread () + " released token"); diff --git a/java/tests/Connection/AcceptorTest.java b/java/tests/Connection/AcceptorTest.java index 864a7dbe5a1..0f8877f52d9 100644 --- a/java/tests/Connection/AcceptorTest.java +++ b/java/tests/Connection/AcceptorTest.java @@ -14,8 +14,8 @@ package tests.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.Connection.*; +import JACE.OS.*; +import JACE.Connection.*; public class AcceptorTest { diff --git a/java/tests/Connection/ClientHandler.java b/java/tests/Connection/ClientHandler.java index cb2bde1df85..702c633ceca 100644 --- a/java/tests/Connection/ClientHandler.java +++ b/java/tests/Connection/ClientHandler.java @@ -14,8 +14,8 @@ package tests.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.Connection.*; +import JACE.OS.*; +import JACE.Connection.*; public class ClientHandler extends SvcHandler { diff --git a/java/tests/Connection/ConnectorTest.java b/java/tests/Connection/ConnectorTest.java index d3722b768ea..605d5e7a400 100644 --- a/java/tests/Connection/ConnectorTest.java +++ b/java/tests/Connection/ConnectorTest.java @@ -14,8 +14,8 @@ package tests.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.Connection.*; +import JACE.OS.*; +import JACE.Connection.*; public class ConnectorTest { diff --git a/java/tests/Connection/ServerHandler.java b/java/tests/Connection/ServerHandler.java index d46a6e1e125..7cdd50d7d37 100644 --- a/java/tests/Connection/ServerHandler.java +++ b/java/tests/Connection/ServerHandler.java @@ -14,8 +14,8 @@ package tests.Connection; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.Connection.*; +import JACE.OS.*; +import JACE.Connection.*; public class ServerHandler extends SvcHandler { diff --git a/java/tests/Misc/ParseArgsTest.java b/java/tests/Misc/ParseArgsTest.java index f2976ddcb11..5baddd2745d 100644 --- a/java/tests/Misc/ParseArgsTest.java +++ b/java/tests/Misc/ParseArgsTest.java @@ -12,8 +12,8 @@ // ============================================================================ package tests.Misc; -import ACE.OS.*; -import ACE.Misc.*; +import JACE.OS.*; +import JACE.Misc.*; public class ParseArgsTest { diff --git a/java/tests/Reactor/TimeValueTest.java b/java/tests/Reactor/TimeValueTest.java index 85c794c1b01..b4f3e420ae1 100644 --- a/java/tests/Reactor/TimeValueTest.java +++ b/java/tests/Reactor/TimeValueTest.java @@ -11,8 +11,8 @@ *************************************************/ package tests.Reactor; -import ACE.OS.*; -import ACE.ASX.*; +import JACE.OS.*; +import JACE.ASX.*; public class TimeValueTest { diff --git a/java/tests/Reactor/TimerQueueTest.java b/java/tests/Reactor/TimerQueueTest.java index 114125c25f9..d34439dcf9b 100644 --- a/java/tests/Reactor/TimerQueueTest.java +++ b/java/tests/Reactor/TimerQueueTest.java @@ -12,9 +12,9 @@ // ============================================================================ package tests.Reactor; -import ACE.OS.*; -import ACE.ASX.*; -import ACE.Reactor.*; +import JACE.OS.*; +import JACE.ASX.*; +import JACE.Reactor.*; public class TimerQueueTest implements EventHandler { diff --git a/java/tests/SOCK_SAP/SOCKAcceptorTest.java b/java/tests/SOCK_SAP/SOCKAcceptorTest.java index 432784e3bb4..34ab8ecb6c9 100644 --- a/java/tests/SOCK_SAP/SOCKAcceptorTest.java +++ b/java/tests/SOCK_SAP/SOCKAcceptorTest.java @@ -14,8 +14,8 @@ package tests.SOCK_SAP; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.SOCK_SAP.*; +import JACE.OS.*; +import JACE.SOCK_SAP.*; class TestHandler extends Thread { diff --git a/java/tests/SOCK_SAP/SOCKConnectorTest.java b/java/tests/SOCK_SAP/SOCKConnectorTest.java index f9d135753f2..6af4fd5cba6 100644 --- a/java/tests/SOCK_SAP/SOCKConnectorTest.java +++ b/java/tests/SOCK_SAP/SOCKConnectorTest.java @@ -14,8 +14,8 @@ package tests.SOCK_SAP; import java.io.*; import java.net.*; -import ACE.OS.*; -import ACE.SOCK_SAP.*; +import JACE.OS.*; +import JACE.SOCK_SAP.*; public class SOCKConnectorTest { diff --git a/java/tests/ServiceConfigurator/TestService.java b/java/tests/ServiceConfigurator/TestService.java index d8923cd83a5..66eb04619c5 100644 --- a/java/tests/ServiceConfigurator/TestService.java +++ b/java/tests/ServiceConfigurator/TestService.java @@ -11,8 +11,8 @@ *************************************************/ package tests.ServiceConfigurator; -import ACE.ServiceConfigurator.*; -import ACE.OS.*; +import JACE.ServiceConfigurator.*; +import JACE.OS.*; public class TestService extends ServiceObject { @@ -27,3 +27,4 @@ public class TestService extends ServiceObject } } + diff --git a/java/tests/ServiceConfigurator/mainTest.java b/java/tests/ServiceConfigurator/mainTest.java index 6dc3149cc61..2f87c57330e 100644 --- a/java/tests/ServiceConfigurator/mainTest.java +++ b/java/tests/ServiceConfigurator/mainTest.java @@ -11,8 +11,8 @@ *************************************************/ package tests.ServiceConfigurator; -import ACE.ServiceConfigurator.*; -import ACE.OS.*; +import JACE.ServiceConfigurator.*; +import JACE.OS.*; import java.io.*; public class mainTest @@ -41,7 +41,7 @@ public class mainTest } catch (ClassNotFoundException e) { - ACE.ERROR (e); + ACE.ERROR (e + "foo"); } catch (IllegalAccessException e) { |