Project

General

Profile

« Previous | Next » 

Revision 3f91e2a5

Added by Cherian Mathew over 9 years ago

pom.xml : updated jetty version to 9, added jetty annotations jar to be compatible with servlet 3 annotations
Bootloader.java : updated code to be compatible with jetty 9 and added classlist for servlet
web.xml : updated webapp version to 3 for compatibility with servlet 3

View differences:

src/main/java/eu/etaxonomy/cdm/server/Bootloader.java
360 360
        server = new Server(httpPort);
361 361
        server.addLifeCycleListener(instanceManager);
362 362

  
363
        org.eclipse.jetty.webapp.Configuration.ClassList classlist = org.eclipse.jetty.webapp.Configuration.ClassList.setServerDefault(server);
364
        classlist.addAfter("org.eclipse.jetty.webapp.FragmentConfiguration", "org.eclipse.jetty.plus.webapp.EnvConfiguration", "org.eclipse.jetty.plus.webapp.PlusConfiguration");
365
        classlist.addBefore("org.eclipse.jetty.webapp.JettyWebXmlConfiguration", "org.eclipse.jetty.annotations.AnnotationConfiguration");
366
        
363 367
        // JMX support
364 368
        if(cmdLine.hasOption(JMX.getOpt())){
365 369
            logger.info("adding JMX support ...");
366 370
            MBeanContainer mBeanContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer());
367
            server.getContainer().addEventListener(mBeanContainer);
368
            mBeanContainer.addBean(Log.getLog());
369
            mBeanContainer.start();
371
            server.addEventListener(mBeanContainer);
372
            server.addBean(Log.getLog());            
370 373
        }
371 374

  
372 375
        if(cmdLine.hasOption(WIN32SERVICE.getOpt())){

Also available in: Unified diff