Changed package name from ACE to JACE

24 files changed, 52 insertions, 51 deletions

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)
       {