Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

430341 Use apache jsp/jstl by default in 9.2.0

This commit is contained in:
Greg Wilkins 2014-04-03 14:16:13 +11:00
parent 077887141f
commit 157a54ec5c
11 changed files with 70 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apache-jsp/src/main/config/modules/apache-jsp.mod
View File

@ -1,14 +0,0 @@
#
# Apache JSP Module
#
[depend]
servlet
[lib]
lib/apache-jsp/*.jar
[ini-template]
# JSP Configuration
# To use an non-jdk compiler for JSP compilation uncomment next line
# -Dorg.apache.jasper.compiler.disablejsr199=true

10
apache-jsp/src/main/config/modules/jsp-impl/apache-jsp.mod Normal file
View File

@ -0,0 +1,10 @@
#
# Apache JSP Module
#
[name]
jsp-impl
[lib]
lib/apache-jsp/*.jar

11
apache-jstl/src/main/config/modules/apache-jstl.mod
View File

@ -1,11 +0,0 @@
#
# Apache JSTL
#
[lib]
lib/apache-jstl/*.jar
[ini-template]
# This module adds the Apache JSTL implementation to the server classpath
# This module is not needed if the glassfish JSP impl (module == jsp) is used, as it includes the glassfish version of jstl
# This module is needed if JSTL will be used by the apache JSP impl (module == apache-jsp) and there is no JSTL impl in the WEB-INF/lib of the webapp

8
apache-jstl/src/main/config/modules/jsp-impl/apache-jstl.mod Normal file
View File

@ -0,0 +1,8 @@
#
# Apache JSTL
#
[name]
jstl-impl
[lib]
lib/apache-jstl/*.jar

6
jetty-distribution/pom.xml
View File

@ -465,7 +465,7 @@
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty,org.eclipse.jetty.toolchain,javax.servlet.jsp,org.mortbay.jasper,org.mortbay.jasper,org.eclipse.jetty.orbit</includeGroupIds>
<includeArtifactIds>apache-jsp,jetty-schemas,javax.servlet.jsp-api,apache-el,org.eclipse.jdt.core</includeArtifactIds>
<includeArtifactIds>apache-jsp,javax.servlet.jsp-api,apache-el,org.eclipse.jdt.core</includeArtifactIds>
<includeTypes>jar</includeTypes>
<prependGroupId>true</prependGroupId>
<outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory>
@ -554,7 +554,7 @@
<argument>jetty.home=${assembly-directory}</argument>
<argument>jetty.base=${assembly-directory}</argument>
<argument>--add-to-start=server,deploy,websocket,ext,resources</argument>
<argument>--add-to-startd=jsp,http</argument>
<argument>--add-to-startd=jsp,jstl,http</argument>
</arguments>
</configuration>
<goals>
@ -570,7 +570,7 @@
<argument>jetty.home=${assembly-directory}</argument>
<argument>jetty.base=${assembly-directory}/demo-base</argument>
<argument>--add-to-start=server,continuation,deploy,ext,resources,client,annotations,jndi,servlets</argument>
<argument>--add-to-startd-ini=jsp,http,https</argument>
<argument>--add-to-startd-ini=jsp,jstl,http,https</argument>
</arguments>
</configuration>
<goals>

20
jetty-distribution/src/main/resources/modules/jsp.mod Normal file
View File

@ -0,0 +1,20 @@
#
# Jetty JSP Module
#
[depend]
servlet
jsp-impl/${jsp-impl}-jsp
[ini-template]
# JSP Configuration
# Select JSP implementation, choices are
# glassfish : The reference implementation
# default in jetty <= 9.1
# apache : The apache version
# default jetty >= 9.2
jsp-impl=apache
# To use an non-jdk compiler for JSP compilation uncomment next line
# -Dorg.apache.jasper.compiler.disablejsr199=true

14
jetty-distribution/src/main/resources/modules/jstl.mod Normal file
View File

@ -0,0 +1,14 @@
#
# Jetty JSP Module
#
[depend]
jsp
jsp-impl/${jsp-impl}-jstl
[ini-template]
# JSTL Configuration
# The glassfish jsp-impl includes JSTL by default and this module
# is not required to activate it.
# The apache jsp-impl does not include JSTL by default and this module
# is required to put JSTL on the container classpath

8
jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod Normal file
View File

@ -0,0 +1,8 @@
#
# Glassfish JSP Module
#
[name]
jsp-impl
[lib]
lib/jsp/*.jar

6
jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod Normal file
View File

@ -0,0 +1,6 @@
#
# Glassfish JSTL
[name]
jstl-impl
# This file is empty as glassfish jstl is provided by glassfish jsp

14
jetty-jsp/src/main/config/modules/jsp.mod
View File

@ -1,14 +0,0 @@
#
# Jetty JSP Module
#
[depend]
servlet
[lib]
lib/jsp/*.jar
[ini-template]
# JSP Configuration
# To use an non-jdk compiler for JSP compilation uncomment next line
# -Dorg.apache.jasper.compiler.disablejsr199=true

2
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
View File

@ -197,7 +197,7 @@ public class Modules implements Iterable<Module>
}
for (String parent : module.getParentNames())
{
System.out.printf(" Parent: %s%n",parent);
System.out.printf(" Depend: %s%n",parent);
}
for (String lib : module.getLibs())
{