Deprecation of global Slice definitions.

51 files changed, 145 insertions, 10 deletions

diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java
index f7aee6eb942..4f6406fb9d6 100644
--- a/java/demo/Freeze/bench/Client.java
+++ b/java/demo/Freeze/bench/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class TestApp extends Ice.Application
 {
     TestApp(String envName)
diff --git a/java/demo/Freeze/bench/Test.ice b/java/demo/Freeze/bench/Test.ice
index 40dfef6a96e..23d76da8ab1 100644
--- a/java/demo/Freeze/bench/Test.ice
+++ b/java/demo/Freeze/bench/Test.ice
@@ -7,6 +7,9 @@
 //
 // **********************************************************************
 
+module Demo
+{
+
 struct Struct1
 {
     long l;
@@ -27,3 +30,5 @@ class Class2 extends Class1
     Object obj;
     Object rec;
 };
+
+};
diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml
index 5fc12961ceb..4378165c90e 100644
--- a/java/demo/Freeze/bench/build.xml
+++ b/java/demo/Freeze/bench/build.xml
@@ -64,9 +64,9 @@
                 <pathelement path="${slice.dir}" />
             </includepath>
             <fileset dir="." includes="Test.ice"/>
-	    <dict name="Struct1Struct2Map" key="Struct1" value="Struct2"/>
-	    <dict name="Struct1Class1Map" key="Struct1" value="Class1"/>
-	    <dict name="Struct1ObjectMap" key="Struct1" value="Object"/>
+	    <dict name="Struct1Struct2Map" key="Demo::Struct1" value="Demo::Struct2"/>
+	    <dict name="Struct1Class1Map" key="Demo::Struct1" value="Demo::Class1"/>
+	    <dict name="Struct1ObjectMap" key="Demo::Struct1" value="Object"/>
         </slice2freezej>
     </target>
 
diff --git a/java/demo/Freeze/library/BookI.java b/java/demo/Freeze/library/BookI.java
index 5dacd3f4679..b75365d1f4e 100644
--- a/java/demo/Freeze/library/BookI.java
+++ b/java/demo/Freeze/library/BookI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class BookI extends Book
 {
     //
diff --git a/java/demo/Freeze/library/Library.ice b/java/demo/Freeze/library/Library.ice
index 915aa6bff4c..b571d3d66fc 100644
--- a/java/demo/Freeze/library/Library.ice
+++ b/java/demo/Freeze/library/Library.ice
@@ -10,6 +10,9 @@
 #ifndef LIBRARY_ICE
 #define LIBRARY_ICE
 
+module Demo
+{
+
 /**
  *
  * This exception is raised in the case of a database failure.
@@ -227,4 +230,6 @@ interface Library
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java
index 7ab176841c5..52cbcae6f9b 100644
--- a/java/demo/Freeze/library/LibraryI.java
+++ b/java/demo/Freeze/library/LibraryI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class LibraryI extends _LibraryDisp
 {
     public synchronized BookPrx
diff --git a/java/demo/Freeze/library/Parser.java b/java/demo/Freeze/library/Parser.java
index 1dc7262e109..f8b930731c9 100644
--- a/java/demo/Freeze/library/Parser.java
+++ b/java/demo/Freeze/library/Parser.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class Parser
 {
     Parser(Ice.Communicator communicator, LibraryPrx library)
diff --git a/java/demo/Freeze/library/RunParser.java b/java/demo/Freeze/library/RunParser.java
index 5fdcf782e4a..45bac44f680 100644
--- a/java/demo/Freeze/library/RunParser.java
+++ b/java/demo/Freeze/library/RunParser.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class RunParser
 {
     static void
diff --git a/java/demo/Freeze/phonebook/ContactI.java b/java/demo/Freeze/phonebook/ContactI.java
index e1fb1662e04..9f13584d226 100644
--- a/java/demo/Freeze/phonebook/ContactI.java
+++ b/java/demo/Freeze/phonebook/ContactI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class ContactI extends Contact
 {
     //
diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java
index e4a745ddae3..2a5feaf1152 100644
--- a/java/demo/Freeze/phonebook/Parser.java
+++ b/java/demo/Freeze/phonebook/Parser.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class Parser
 {
     Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook)
diff --git a/java/demo/Freeze/phonebook/PhoneBook.ice b/java/demo/Freeze/phonebook/PhoneBook.ice
index 61c502f3c88..f14c5865794 100644
--- a/java/demo/Freeze/phonebook/PhoneBook.ice
+++ b/java/demo/Freeze/phonebook/PhoneBook.ice
@@ -12,6 +12,9 @@
 
 #include <Ice/Identity.ice>
 
+module Demo
+{
+
 exception DatabaseException
 {
     string message;
@@ -45,4 +48,6 @@ interface PhoneBook
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java
index b0f21c0d76d..3e39c61dba6 100644
--- a/java/demo/Freeze/phonebook/PhoneBookI.java
+++ b/java/demo/Freeze/phonebook/PhoneBookI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class PhoneBookI extends _PhoneBookDisp
 {
     public ContactPrx
diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java
index 4c564dbb671..dc03b0dc3de 100644
--- a/java/demo/Freeze/phonebook/RunParser.java
+++ b/java/demo/Freeze/phonebook/RunParser.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class RunParser
 {
     static void
diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml
index 9f388a27df8..fb99f406af0 100644
--- a/java/demo/Freeze/phonebook/build.xml
+++ b/java/demo/Freeze/phonebook/build.xml
@@ -58,7 +58,7 @@
                 <pathelement path="${slice.dir}" />
             </includepath>
             <fileset dir="." includes="PhoneBook.ice"/>
-	    <index name="NameIndex" type="Contact" member="name" casesensitive="no"/>
+	    <index name="NameIndex" type="Demo::Contact" member="name" casesensitive="no"/>
         </slice2freezej>
     </target>
 
diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java
index 40ced49e7a3..136cf009a92 100644
--- a/java/demo/Glacier/session/Client.java
+++ b/java/demo/Glacier/session/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/Glacier/session/HelloSession.ice b/java/demo/Glacier/session/HelloSession.ice
index b4c1723bd94..140ee60222d 100644
--- a/java/demo/Glacier/session/HelloSession.ice
+++ b/java/demo/Glacier/session/HelloSession.ice
@@ -12,9 +12,14 @@
 
 #include <Glacier/Session.ice>
 
+module Demo
+{
+
 interface HelloSession extends Glacier::Session
 {
     void hello();
 };
 
+};
+
 #endif
diff --git a/java/demo/Glacier/session/HelloSessionI.java b/java/demo/Glacier/session/HelloSessionI.java
index 430c1f4e619..8671c85d31a 100644
--- a/java/demo/Glacier/session/HelloSessionI.java
+++ b/java/demo/Glacier/session/HelloSessionI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-final class HelloSessionI extends HelloSession
+import Demo.*;
+
+final class HelloSessionI extends _HelloSessionDisp
 {
     public
     HelloSessionI(String userId, HelloSessionManagerI manager)
diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice
index 6138731b5c0..f1ae0a03df8 100644
--- a/java/demo/Ice/callback/Callback.ice
+++ b/java/demo/Ice/callback/Callback.ice
@@ -10,6 +10,8 @@
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
+module Demo {
+
 interface CallbackReceiver
 {
     void callback();
@@ -21,4 +23,6 @@ interface Callback
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java
index e1dc5430cd3..d310e88a078 100644
--- a/java/demo/Ice/callback/CallbackClient.java
+++ b/java/demo/Ice/callback/CallbackClient.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class CallbackClient extends Ice.Application
 {
     private static void
diff --git a/java/demo/Ice/callback/CallbackI.java b/java/demo/Ice/callback/CallbackI.java
index e879891ca36..2c026b74ab1 100644
--- a/java/demo/Ice/callback/CallbackI.java
+++ b/java/demo/Ice/callback/CallbackI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public final class CallbackI extends _CallbackDisp
 {
     public void
diff --git a/java/demo/Ice/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java
index c408da821c2..656c684fcf9 100644
--- a/java/demo/Ice/callback/CallbackReceiverI.java
+++ b/java/demo/Ice/callback/CallbackReceiverI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public final class CallbackReceiverI extends CallbackReceiver
+import Demo.*;
+
+public final class CallbackReceiverI extends _CallbackReceiverDisp
 {
     public void
     callback(Ice.Current current)
diff --git a/java/demo/Ice/callback/CallbackServer.java b/java/demo/Ice/callback/CallbackServer.java
index 75aa7ca7e46..9c9025d73f1 100644
--- a/java/demo/Ice/callback/CallbackServer.java
+++ b/java/demo/Ice/callback/CallbackServer.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class CallbackServer extends Ice.Application
 {
     public int
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index 6e77b1a3d38..11a2ed73067 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/Ice/hello/Hello.ice b/java/demo/Ice/hello/Hello.ice
index 9b532a2e9a8..b07362aa6df 100644
--- a/java/demo/Ice/hello/Hello.ice
+++ b/java/demo/Ice/hello/Hello.ice
@@ -10,10 +10,14 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo {
+
 interface Hello
 {
     nonmutating void sayHello();
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java
index 02b174e8051..de46e06b2b9 100644
--- a/java/demo/Ice/hello/HelloI.java
+++ b/java/demo/Ice/hello/HelloI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public class HelloI extends Hello
+import Demo.*;
+
+public class HelloI extends _HelloDisp
 {
     public void
     sayHello(Ice.Current current)
diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java
index c3a0d9b0e3c..929e5ae18d7 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/Server.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Server
 {
     private static int
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index 3b801bc4141..7657b48ec40 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static int
diff --git a/java/demo/Ice/latency/Latency.ice b/java/demo/Ice/latency/Latency.ice
index 04c9673ec48..ba5af7216c7 100644
--- a/java/demo/Ice/latency/Latency.ice
+++ b/java/demo/Ice/latency/Latency.ice
@@ -10,8 +10,13 @@
 #ifndef LATENCY_ICE
 #define LATENCY_ICE
 
+module Demo
+{
+
 class Ping
 {
 };
 
+};
+
 #endif
diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java
index 29c86d3703e..64321be7e09 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/Server.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Server
 {
     private static int
diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice
index 916d80d0a12..4216d412f11 100644
--- a/java/demo/Ice/nested/Nested.ice
+++ b/java/demo/Ice/nested/Nested.ice
@@ -10,9 +10,14 @@
 #ifndef NESTED_ICE
 #define NESTED_ICE
 
+module Demo
+{
+
 interface Nested
 {
     void nestedCall(int level, Nested* proxy);
 };
 
+};
+
 #endif
diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java
index 48e277e0bbe..7bfc0266f44 100644
--- a/java/demo/Ice/nested/NestedClient.java
+++ b/java/demo/Ice/nested/NestedClient.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class NestedClient extends Ice.Application
 {
     public int
diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java
index 8f45576a92d..ff624b419d4 100644
--- a/java/demo/Ice/nested/NestedI.java
+++ b/java/demo/Ice/nested/NestedI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-class NestedI extends Nested
+import Demo.*;
+
+class NestedI extends _NestedDisp
 {
     NestedI(NestedPrx self)
     {
diff --git a/java/demo/Ice/nested/NestedServer.java b/java/demo/Ice/nested/NestedServer.java
index 3606a1a83eb..337a812cbf1 100644
--- a/java/demo/Ice/nested/NestedServer.java
+++ b/java/demo/Ice/nested/NestedServer.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class NestedServer extends Ice.Application
 {
     public int
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index b41aa1fb079..f98ac2e461d 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/Ice/throughput/Throughput.ice b/java/demo/Ice/throughput/Throughput.ice
index 20195e9924e..d0346f0dfd9 100644
--- a/java/demo/Ice/throughput/Throughput.ice
+++ b/java/demo/Ice/throughput/Throughput.ice
@@ -10,6 +10,9 @@
 #ifndef THROUGHPUT_ICE
 #define THROUGHPUT_ICE
 
+module Demo
+{
+
 const int seqSize = 500000;
 
 sequence<byte> ByteSeq;
@@ -21,4 +24,6 @@ interface Throughput
     ByteSeq echoByteSeq(ByteSeq seq);
 };
 
+};
+
 #endif
diff --git a/java/demo/Ice/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java
index 733033072fa..2ddfd4c2a66 100644
--- a/java/demo/Ice/throughput/ThroughputI.java
+++ b/java/demo/Ice/throughput/ThroughputI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public final class ThroughputI extends _ThroughputDisp
 {
     public
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index 79369dd4e73..02581546580 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java
index 329047ca33e..43bd6682950 100644
--- a/java/demo/Ice/value/DerivedPrinterI.java
+++ b/java/demo/Ice/value/DerivedPrinterI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class DerivedPrinterI extends DerivedPrinter
 {
     public void
diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java
index e9bbfb79734..580d9f01c0e 100644
--- a/java/demo/Ice/value/InitialI.java
+++ b/java/demo/Ice/value/InitialI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class InitialI extends Initial
 {
     InitialI(Ice.ObjectAdapter adapter)
diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java
index 50e5a4f723b..e3f18002a11 100644
--- a/java/demo/Ice/value/PrinterI.java
+++ b/java/demo/Ice/value/PrinterI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 class PrinterI extends Printer
 {
     public void
diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice
index b8f03f2448b..22fbecbcf17 100644
--- a/java/demo/Ice/value/Value.ice
+++ b/java/demo/Ice/value/Value.ice
@@ -10,6 +10,9 @@
 #ifndef VALUE_ICE
 #define VALUE_ICE
 
+module Demo
+{
+
 class Simple
 {
     string message;
@@ -41,4 +44,6 @@ class Initial
     void throwDerivedPrinter() throws DerivedPrinterException;
 };
 
+};
+
 #endif
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index 3d58e887c16..6cf7d7bade7 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice
index f7344f0d112..52d80d07463 100644
--- a/java/demo/IceBox/hello/Hello.ice
+++ b/java/demo/IceBox/hello/Hello.ice
@@ -10,10 +10,15 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 interface Hello
 {
     void sayHello();
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java
index 02b174e8051..de46e06b2b9 100644
--- a/java/demo/IceBox/hello/HelloI.java
+++ b/java/demo/IceBox/hello/HelloI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public class HelloI extends Hello
+import Demo.*;
+
+public class HelloI extends _HelloDisp
 {
     public void
     sayHello(Ice.Current current)
diff --git a/java/demo/IcePack/hello/Client.java b/java/demo/IcePack/hello/Client.java
index fb2d0551a87..aeb1b2bc19d 100644
--- a/java/demo/IcePack/hello/Client.java
+++ b/java/demo/IcePack/hello/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/IcePack/hello/Hello.ice b/java/demo/IcePack/hello/Hello.ice
index 1fa498dd67c..19f9c3af81e 100644
--- a/java/demo/IcePack/hello/Hello.ice
+++ b/java/demo/IcePack/hello/Hello.ice
@@ -10,6 +10,9 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 class Hello
 {
     /**
@@ -75,4 +78,6 @@ interface HelloFactory
 	throws NameNotExistException;
 };
 
+};
+
 #endif
diff --git a/java/demo/IcePack/hello/HelloFactoryI.java b/java/demo/IcePack/hello/HelloFactoryI.java
index 6bbbc188600..ff12e8c0311 100644
--- a/java/demo/IcePack/hello/HelloFactoryI.java
+++ b/java/demo/IcePack/hello/HelloFactoryI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class HelloFactoryI extends _HelloFactoryDisp
 {
     public HelloPrx
diff --git a/java/demo/IcePack/hello/HelloI.java b/java/demo/IcePack/hello/HelloI.java
index faf5805610d..c037fa0dd50 100644
--- a/java/demo/IcePack/hello/HelloI.java
+++ b/java/demo/IcePack/hello/HelloI.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class HelloI extends Hello
 {
     HelloI(String n)
diff --git a/java/demo/IcePack/simple/Client.java b/java/demo/IcePack/simple/Client.java
index 62480255e54..c58ab55c3ec 100644
--- a/java/demo/IcePack/simple/Client.java
+++ b/java/demo/IcePack/simple/Client.java
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+import Demo.*;
+
 public class Client
 {
     private static void
diff --git a/java/demo/IcePack/simple/Hello.ice b/java/demo/IcePack/simple/Hello.ice
index 9b532a2e9a8..4ce83cbc4c1 100644
--- a/java/demo/IcePack/simple/Hello.ice
+++ b/java/demo/IcePack/simple/Hello.ice
@@ -10,10 +10,15 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 interface Hello
 {
     nonmutating void sayHello();
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/java/demo/IcePack/simple/HelloI.java b/java/demo/IcePack/simple/HelloI.java
index 02b174e8051..de46e06b2b9 100644
--- a/java/demo/IcePack/simple/HelloI.java
+++ b/java/demo/IcePack/simple/HelloI.java
@@ -7,7 +7,9 @@
 //
 // **********************************************************************
 
-public class HelloI extends Hello
+import Demo.*;
+
+public class HelloI extends _HelloDisp
 {
     public void
     sayHello(Ice.Current current)