Changeset 1179

Timestamp:

10/26/11 23:08:07 (20 months ago)

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua

Files:

• server/RunServer.java (modified) (2 diffs)
• service/impl/MUAProcessImpl.java (modified) (2 diffs)
• wsinterface/impl/MultiUnitAggregatorImpl.java (modified) (2 diffs)

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/server/RunServer.java

@@ -14 +14 @@
  * limitations under the License.
  */
+
 package uk.ac.cardiff.raptormua.server;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URL;
-import java.security.ProtectionDomain;
 import java.util.Properties;
 import java.util.TimeZone;
 
-import javax.xml.ws.Endpoint;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.transport.servlet.CXFServlet;
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
 import org.mortbay.jetty.handler.DefaultHandler;
 import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.log.Log;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.context.support.FileSystemXmlApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
 
 import ch.qos.logback.classic.LoggerContext;
@@ -53 +37 @@
 import ch.qos.logback.core.util.StatusPrinter;
 
-import uk.ac.cardiff.raptor.remoting.server.sei.MultiUnitAggregator;
-import uk.ac.cardiff.raptormua.wsinterface.impl.MultiUnitAggregatorImpl;
-
 public class RunServer {
 
-        /**
-         * Programmatically do the following:
-         * 1. Set the Apache CXF logger to use SLF4J
-         * 2. Configure the logback logger
-         * 3. Start a Jetty Server instance including trust and key stores, and set the web.xml in the configuration directory to initialise the servlet.
-         *
-         * @param args
-         * @throws IOException
-         * @throws FileNotFoundException
-         * @throws Exception
-         */
-        public static void main(String args[]) throws FileNotFoundException, IOException {
-                System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Slf4jLogger");
-                TimeZone.setDefault(TimeZone.getTimeZone("Etc/UTC"));
-                String configurationFiles = System.getProperty("configurationFiles", System.getProperty("user.dir") + "/target/conf");
+    /**
+     * Programmatically do the following: 1. Set the Apache CXF logger to use SLF4J 2. Configure the logback logger 3.
+     * Start a Jetty Server instance including trust and key stores, and set the web.xml in the configuration directory
+     * to initialise the servlet.
+     * 
+     * @param args
+     * @throws IOException
+     * @throws FileNotFoundException
+     * @throws Exception
+     */
+    public static void main(String args[]) throws FileNotFoundException, IOException {
+        System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Slf4jLogger");
+        TimeZone.setDefault(TimeZone.getTimeZone("Etc/UTC"));
+        String configurationFiles =
+                System.getProperty("configurationFiles", System.getProperty("user.dir") + "/target/conf");
 
-                configureLogger(configurationFiles+"/logging.xml");
+        configureLogger(configurationFiles + "/logging.xml");
 
-                Properties props = new Properties();
-                props.load(new FileInputStream(configurationFiles + "/server.properties"));
+        Properties props = new Properties();
+        props.load(new FileInputStream(configurationFiles + "/server.properties"));
 
-                int portNumber = Integer.parseInt(props.getProperty("jetty.port", "8443"));
-                String keyStoreLocaion = props.getProperty("jetty.keyStoreLocation", "");
-                String keyStorePassword = props.getProperty("jetty.keyStorePassword", "changeit");
-                String trustStoreLocaion = props.getProperty("jetty.trustStoreLocation", "");
-                String trustStorePassword = props.getProperty("jetty.trustStorePassword", "changeit");
-                String webappContextPath = props.getProperty("jetty.webapp.contextPath", "/MUA");
+        int portNumber = Integer.parseInt(props.getProperty("jetty.port", "8443"));
+        String keyStoreLocaion = props.getProperty("jetty.keyStoreLocation", "");
+        String keyStorePassword = props.getProperty("jetty.keyStorePassword", "changeit");
+        String trustStoreLocaion = props.getProperty("jetty.trustStoreLocation", "");
+        String trustStorePassword = props.getProperty("jetty.trustStorePassword", "changeit");
+        String webappContextPath = props.getProperty("jetty.webapp.contextPath", "/MUA");
 
+        System.out.println("[INFO] Jetty Config: Using Port " + portNumber);
+        System.out.println("[INFO] Servlet and Spring Config: Configuration files at " + configurationFiles);
 
-                System.out.println("[INFO] Jetty Config: Using Port " + portNumber);
-                System.out.println("[INFO] Servlet and Spring Config: Configuration files at " + configurationFiles);
+        Server server = new Server();
 
-                Server server = new Server();
+        SslSocketConnector sslConnector = new SslSocketConnector();
+        sslConnector.setPort(portNumber);
+        sslConnector.setMaxIdleTime(30000);
+        sslConnector.setKeystore(keyStoreLocaion);
+        sslConnector.setPassword(keyStorePassword);
+        sslConnector.setKeyPassword(keyStorePassword);
+        sslConnector.setTruststore(trustStoreLocaion);
+        sslConnector.setTrustPassword(trustStorePassword);
 
-                SslSocketConnector sslConnector = new SslSocketConnector();
-                sslConnector.setPort(portNumber);
-                sslConnector.setMaxIdleTime(30000);
-                sslConnector.setKeystore(keyStoreLocaion);
-                sslConnector.setPassword(keyStorePassword);
-                sslConnector.setKeyPassword(keyStorePassword);
-                sslConnector.setTruststore(trustStoreLocaion);
-                sslConnector.setTrustPassword(trustStorePassword);
-                
-                //SocketConnector connector = new SocketConnector();
-                //connector.setPort(portNumber);
+        // SocketConnector connector = new SocketConnector();
+        // connector.setPort(portNumber);
 
-                // enable mutual authentication
-                //sslConnector.setNeedClientAuth(true);
+        // enable mutual authentication
+        sslConnector.setNeedClientAuth(true);
 
-                server.setConnectors(new Connector[] { sslConnector });
+        server.setConnectors(new Connector[] {sslConnector});
 
-                WebAppContext webappcontext = new WebAppContext();
-                webappcontext.setDescriptor(configurationFiles + "/web.xml");
-                webappcontext.setContextPath(webappContextPath);
-                webappcontext.setWar(configurationFiles);
+        WebAppContext webappcontext = new WebAppContext();
+        webappcontext.setDescriptor(configurationFiles + "/web.xml");
+        webappcontext.setContextPath(webappContextPath);
+        webappcontext.setWar(configurationFiles);
 
-                HandlerCollection handlers = new HandlerCollection();
-                handlers.setHandlers(new Handler[] { webappcontext, new DefaultHandler() });
+        HandlerCollection handlers = new HandlerCollection();
+        handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});
 
-                server.setHandler(handlers);
+        server.setHandler(handlers);
 
-                try {
-                        server.start();
-                        server.join();
-                } catch (Exception e) {
-                        e.printStackTrace();
-                        System.exit(100);
-                }
+        try {
+            server.start();
+            server.join();
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(100);
+        }
 
-        }
+    }
 
-        private static void configureLogger(String logback) {
-                LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+    private static void configureLogger(String logback) {
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
 
-                try {
-                        JoranConfigurator configurator = new JoranConfigurator();
-                        configurator.setContext(lc);
-                        lc.reset();
-                        configurator.doConfigure(logback);
-                } catch (JoranException je) {
-                        // StatusPrinter will handle thiss
-                }
-                StatusPrinter.print(lc);
+        try {
+            JoranConfigurator configurator = new JoranConfigurator();
+            configurator.setContext(lc);
+            lc.reset();
+            configurator.doConfigure(logback);
+        } catch (JoranException je) {
+            // StatusPrinter will handle thiss
+        }
+        StatusPrinter.print(lc);
 
-        }
+    }
 
 }

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/service/impl/MUAProcessImpl.java

@@ -48 +48 @@
  * All operations should go through this service class, so as to obey locks and synchronisation issues. Locks collisions
  * are thrown use a <code>SoapFault</code> . Fault codes are: Client (if a malformed input e.g. statistic name is wrong)
- * Server (we use for locks, as server side issue) VersionMismatch MustUnderstand
+ * Server (we use if a lock is hit, as a server side issue).
  * 
  * @author philsmart
@@ -91 +91 @@
             try {
                 engine.release();
-
             } catch (Exception e) {
                 log.error("Error trying to release events {}", e.getMessage());

raptor-mua/trunk/src/main/java/uk/ac/cardiff/raptormua/wsinterface/impl/MultiUnitAggregatorImpl.java

@@ -46 +46 @@
 public class MultiUnitAggregatorImpl implements MultiUnitAggregator {
 
-    /** The process service. */
+    /** The mua process service. */
     private MUAProcess processService;
 
@@ -82 +82 @@
      */
     public Capabilities getCapabilities() {
-        // TODO Auto-generated method stub
         return processService.getCapabilities();
     }