Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 6 insertions, 9 deletions

diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index 08295ab1b44..2edfb823034 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
-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;
 }