Revision 0cc3815c
Added by Cherian Mathew about 9 years ago
| pom.xml | ||
|---|---|---|
| 615 | 615 |
<version>${jetty-version}</version>
|
| 616 | 616 |
</dependency> |
| 617 | 617 |
<dependency> |
| 618 |
<groupId>org.mortbay.jetty</groupId> |
|
| 619 |
<artifactId>jsp-2.1-glassfish</artifactId> |
|
| 620 |
<version>9.1.1.B60.25.p2</version> |
|
| 618 |
<groupId>org.eclipse.jetty</groupId> |
|
| 619 |
<artifactId>apache-jsp</artifactId> |
|
| 620 |
<version>${jetty-version}</version>
|
|
| 621 |
<type>jar</type> |
|
| 622 |
</dependency> |
|
| 623 |
<dependency> |
|
| 624 |
<groupId>org.eclipse.jetty</groupId> |
|
| 625 |
<artifactId>apache-jstl</artifactId> |
|
| 626 |
<version>${jetty-version}</version>
|
|
| 627 |
<type>pom</type> |
|
| 621 | 628 |
</dependency> |
| 622 | 629 |
<dependency> |
| 623 | 630 |
<groupId>javax.transaction</groupId> |
| src/main/java/eu/etaxonomy/cdm/server/Bootloader.java | ||
|---|---|---|
| 356 | 356 |
|
| 357 | 357 |
// load the configured instances for the first time |
| 358 | 358 |
instanceManager.reLoadInstanceConfigurations(); |
| 359 |
|
|
| 359 |
// for jetty 9.2+ we need the following system property |
|
| 360 |
// refer : http://www.eclipse.org/jetty/documentation/current/configuring-jsp.html |
|
| 361 |
System.setProperty("org.apache.jasper.compiler.disablejsr199", "true");
|
|
| 360 | 362 |
server = new Server(httpPort); |
| 361 | 363 |
server.addLifeCycleListener(instanceManager); |
| 362 | 364 |
|
| 363 | 365 |
org.eclipse.jetty.webapp.Configuration.ClassList classlist = org.eclipse.jetty.webapp.Configuration.ClassList.setServerDefault(server); |
| 364 | 366 |
classlist.addAfter("org.eclipse.jetty.webapp.FragmentConfiguration", "org.eclipse.jetty.plus.webapp.EnvConfiguration", "org.eclipse.jetty.plus.webapp.PlusConfiguration");
|
| 365 | 367 |
classlist.addBefore("org.eclipse.jetty.webapp.JettyWebXmlConfiguration", "org.eclipse.jetty.annotations.AnnotationConfiguration");
|
| 366 |
|
|
| 368 |
|
|
| 367 | 369 |
// JMX support |
| 368 | 370 |
if(cmdLine.hasOption(JMX.getOpt())){
|
| 369 | 371 |
logger.info("adding JMX support ...");
|
| 370 | 372 |
MBeanContainer mBeanContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer()); |
| 371 | 373 |
server.addEventListener(mBeanContainer); |
| 372 |
server.addBean(Log.getLog());
|
|
| 374 |
server.addBean(Log.getLog()); |
|
| 373 | 375 |
} |
| 374 | 376 |
|
| 375 | 377 |
if(cmdLine.hasOption(WIN32SERVICE.getOpt())){
|
Also available in: Unified diff
updated jsp configuration according to https://github.com/jetty-project/embedded-jetty-jsp