From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/process/StandardServer.java | 39 +++++++++++++------------
 1 file changed, 21 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/process/StandardServer.java

(limited to 'source/com/c2kernel/process/StandardServer.java')

diff --git a/source/com/c2kernel/process/StandardServer.java b/source/com/c2kernel/process/StandardServer.java
old mode 100755
new mode 100644
index 2c9bcaf..72b761e
--- a/source/com/c2kernel/process/StandardServer.java
+++ b/source/com/c2kernel/process/StandardServer.java
@@ -16,21 +16,21 @@ import org.tanukisoftware.wrapper.WrapperManager;
 import com.c2kernel.utils.Logger;
 
 /**************************************************************************
- * Base class for all servers i.e. c2k processes that serve Entities 
+ * Base class for all servers i.e. c2k processes that serve Entities
  *
  * @author $Author: abranson $ $Date: 2005/04/28 13:49:43 $
  * @version $Revision: 1.47 $
  **************************************************************************/
 public class StandardServer extends AbstractMain implements WrapperListener
 {
-    protected static StandardServer server;           
+    protected static StandardServer server;
 
 
    /**************************************************************************
     * C2KRootPOA suitable for Factory objects
     **************************************************************************/
 
-    
+
 
 
 
@@ -44,26 +44,27 @@ public class StandardServer extends AbstractMain implements WrapperListener
     {
         // read args and init Gateway
         standardSetUp(args);
-        
+
         // connect to LDAP as root
         Gateway.connect();
-        
+
         //start console
         Logger.initConsole("ItemServer");
-        
+
         //initialize the server objects
         Gateway.startServer();
-        
+
         Logger.msg(5, "StandardServer::standardInitialisation - complete.");
 
     }
 
-   
+
    /**************************************************************************
     * Sets up and runs and item server
     **************************************************************************/
-    public Integer start(String[] args)
-    {   
+    @Override
+	public Integer start(String[] args)
+    {
         try
         {
             //initialise everything
@@ -76,17 +77,18 @@ public class StandardServer extends AbstractMain implements WrapperListener
         }
         return null;
     }
-    
+
     public static void main(String[] args) {
         server = new StandardServer();
         AbstractMain.runningAsWrapper = true;
         WrapperManager.start( server, args );
     }
-   
+
     /**
      *
      */
-    public void controlEvent(int event) {
+    @Override
+	public void controlEvent(int event) {
         if (WrapperManager.isControlledByNativeWrapper()) {
             // The Wrapper will take care of this event
         } else {
@@ -105,11 +107,12 @@ public class StandardServer extends AbstractMain implements WrapperListener
      * Closes all listeners, quits the VM.
      * This method should be called to kill the server process
      * e.g. from the NT service wrapper
-     **************************************************************************/  
-    public int stop(int arg0) {
+     **************************************************************************/
+    @Override
+	public int stop(int arg0) {
         try
-        {           
-            // close gateway             
+        {
+            // close gateway
             standardTearDown();
         }
         catch( Exception ex )
@@ -117,7 +120,7 @@ public class StandardServer extends AbstractMain implements WrapperListener
             Logger.error(ex);
             return 1;
         }
-                
+
         Logger.msg("StandardServer::shutdown - complete. ");
         return 0;
     }
-- 
cgit v1.2.3