Bug 3385 - java class must match file name

11 files changed, 47 insertions, 68 deletions

diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java
index 6492a3da01d..a1c3b17aca9 100644
--- a/java/demo/Freeze/bench/Client.java
+++ b/java/demo/Freeze/bench/Client.java
@@ -9,13 +9,8 @@
 
 import Demo.*;
 
-class TestApp extends Ice.Application
+class Client extends Ice.Application
 {
-    TestApp(String envName)
-    {
-        _envName = envName;
-    }
-
     void
     IntIntMapTest(Freeze.Map m, boolean fast)
     {
@@ -594,18 +589,20 @@ class TestApp extends Ice.Application
         }
     }
 
-    private Freeze.Connection _connection;
-    private int _repetitions = 10000;
-    private StopWatch _watch = new StopWatch();
-    private String _envName;
-}
+    Client(String envName)
+    {
+        _envName = envName;
+    }
 
-public class Client
-{
     static public void
     main(String[] args)
     {
-        TestApp app = new TestApp("db");
-        app.main("test.Freeze.bench.Client", args);
+        Client app = new Client("db");
+        app.main("demo.Freeze.bench.Client", args);
     }
+
+    private Freeze.Connection _connection;
+    private int _repetitions = 10000;
+    private StopWatch _watch = new StopWatch();
+    private String _envName;
 }
diff --git a/java/demo/Freeze/casino/Server.java b/java/demo/Freeze/casino/Server.java
index 298b540d4b3..1006d84bdf1 100644
--- a/java/demo/Freeze/casino/Server.java
+++ b/java/demo/Freeze/casino/Server.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-class CasinoServer extends Ice.Application
+class Server extends Ice.Application
 {
     static class ObjectFactory implements Ice.ObjectFactory
     {
@@ -223,11 +223,18 @@ class CasinoServer extends Ice.Application
        return 0;
     }
 
-    CasinoServer(String envName)
+    Server(String envName)
     {
         _envName = envName;
     }
 
+    static public void
+    main(String[] args)
+    {
+        Server app = new Server("db");
+        app.main("demo.Freeze.casino.Server", args, "config.server");
+    }
+
     private String _envName;
 
     private CasinoStore.PersistentBankPrx _bankPrx;
@@ -237,13 +244,3 @@ class CasinoServer extends Ice.Application
     private BetResolver _betResolver; 
     private int _bankEdge;
 }
-
-public class Server
-{
-    static public void
-    main(String[] args)
-    {
-        CasinoServer app = new CasinoServer("db");
-        app.main("demo.Freeze.casino.Server", args, "config.server");
-    }
-}
diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java
index 8d5c033c2d7..59ec71daa90 100644
--- a/java/demo/Freeze/library/Collocated.java
+++ b/java/demo/Freeze/library/Collocated.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-class LibraryCollocated extends Ice.Application
+class Collocated extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
@@ -76,20 +76,17 @@ class LibraryCollocated extends Ice.Application
         return status;
     }
 
-    LibraryCollocated(String envName)
+    Collocated(String envName)
     {
         _envName = envName;
     }
 
-    private String _envName;
-}
-
-public class Collocated
-{
     static public void
     main(String[] args)
     {
-        LibraryCollocated app = new LibraryCollocated("db");
+        Collocated app = new Collocated("db");
         app.main("demo.Freeze.library.Collocated", args, "config.collocated");
     }
+
+    private String _envName;
 }
diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index 08295ab1b44..88b9d8f556f 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-class LibraryServer extends Ice.Application
+class Server extends Ice.Application
 {
     public int
     run(String[] args)
@@ -62,20 +62,17 @@ class LibraryServer extends Ice.Application
         return 0;
     }
 
-    LibraryServer(String envName)
+    Server(String envName)
     {
         _envName = envName;
     }
 
-    private String _envName;
-}
-
-public class Server
-{
     static public void
     main(String[] args)
     {
-        LibraryServer app = new LibraryServer("db");
+        Server app = new Server("db");
         app.main("demo.Freeze.library.Server", args, "config.server");
     }
+
+    private String _envName;
 }
diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java
index dbd82106400..4a59be3c408 100644
--- a/java/demo/Freeze/phonebook/Collocated.java
+++ b/java/demo/Freeze/phonebook/Collocated.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-class PhoneBookCollocated extends Ice.Application
+class Collocated extends Ice.Application
 {
     class ShutdownHook extends Thread
     {
@@ -97,20 +97,17 @@ class PhoneBookCollocated extends Ice.Application
         return status;
     }
 
-    PhoneBookCollocated(String envName)
+    Collocated(String envName)
     {
         _envName = envName;
     }
 
-    private String _envName;
-}
-
-public class Collocated
-{
     static public void
     main(String[] args)
     {
-        PhoneBookCollocated app = new PhoneBookCollocated("db");
+        Collocated app = new Collocated("db");
         app.main("demo.Freeze.phonebook.Collocated", args, "config.collocated");
     }
+
+    private String _envName;
 }
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index ba013f999dc..b222b911928 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-class PhoneBookServer extends Ice.Application
+class Server extends Ice.Application
 {
     public int
     run(String[] args)
@@ -82,20 +82,17 @@ class PhoneBookServer extends Ice.Application
         return 0;
     }
 
-    PhoneBookServer(String envName)
+    Server(String envName)
     {
         _envName = envName;
     }
 
-    private String _envName;
-}
-
-public class Server
-{
     static public void
     main(String[] args)
     {
-        PhoneBookServer app = new PhoneBookServer("db");
+        Server app = new Server("db");
         app.main("demo.Freeze.phonebook.Server", args, "config.server");
     }
+
+    private String _envName;
 }
diff --git a/java/demo/Freeze/transform/Create.java b/java/demo/Freeze/transform/Create.java
index 892244cb7d9..ddd0f8dcfbf 100644
--- a/java/demo/Freeze/transform/Create.java
+++ b/java/demo/Freeze/transform/Create.java
@@ -81,6 +81,6 @@ class Create extends Ice.Application
     main(String[] args)
     {
         Create app = new Create();
-        app.main("test.Freeze.transform.Create", args);
+        app.main("demo.Freeze.transform.Create", args);
     }
 }
diff --git a/java/demo/Freeze/transform/Read.java b/java/demo/Freeze/transform/Read.java
index 476ddd2b24c..891f7fe78bd 100644
--- a/java/demo/Freeze/transform/Read.java
+++ b/java/demo/Freeze/transform/Read.java
@@ -86,6 +86,6 @@ class Read extends Ice.Application
     main(String[] args)
     {
         Read app = new Read();
-        app.main("test.Freeze.transform.Read", args);
+        app.main("demo.Freeze.transform.Read", args);
     }
 }
diff --git a/java/demo/Freeze/transform/ReadNew.java b/java/demo/Freeze/transform/ReadNew.java
index 8759dd24dbe..5d2ba3833b4 100644
--- a/java/demo/Freeze/transform/ReadNew.java
+++ b/java/demo/Freeze/transform/ReadNew.java
@@ -92,6 +92,6 @@ class ReadNew extends Ice.Application
     main(String[] args)
     {
         ReadNew app = new ReadNew();
-        app.main("test.Freeze.transform.ReadNew", args);
+        app.main("demo.Freeze.transform.ReadNew", args);
     }
 }
diff --git a/java/demo/Freeze/transform/Recreate.java b/java/demo/Freeze/transform/Recreate.java
index 89bbe8ded56..3ac380d3dc4 100644
--- a/java/demo/Freeze/transform/Recreate.java
+++ b/java/demo/Freeze/transform/Recreate.java
@@ -64,6 +64,6 @@ class Recreate extends Ice.Application
     main(String[] args)
     {
         Recreate app = new Recreate();
-        app.main("test.Freeze.transform.Recreate", args);
+        app.main("demo.Freeze.transform.Recreate", args);
     }
 }
diff --git a/java/demo/book/lifecycle/Server.java b/java/demo/book/lifecycle/Server.java
index c6f681db73a..86e37fa44b9 100644
--- a/java/demo/book/lifecycle/Server.java
+++ b/java/demo/book/lifecycle/Server.java
@@ -9,7 +9,7 @@
 
 import FilesystemI.*;
 
-class FilesystemApp extends Ice.Application
+class Server extends Ice.Application
 {
     public int
     run(String[] args)
@@ -44,14 +44,11 @@ class FilesystemApp extends Ice.Application
 
         return 0;
     }
-}
 
-public class Server
-{
     static public void
     main(String[] args)
     {
-        FilesystemApp app = new FilesystemApp();
+        Server app = new Server();
         app.main("demo.book.lifecycle.Server", args);
     }
 }