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

Issue #2720 Ensure standard jetty properties available in jetty-env.xml (#2806) 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2018-08-16 08:29:12 +10:00 committed by GitHub
parent 9fcb5ef9fb
commit 23bf2504fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
View File

@ -115,6 +115,7 @@ public class EnvConfiguration extends AbstractConfiguration
{
localContextRoot.getRoot().addListener(listener);
XmlConfiguration configuration = new XmlConfiguration(jettyEnvXmlUrl);
configuration.setJettyStandardIdsAndProperties(context.getServer(), null);
WebAppClassLoader.runWithServerClassAccess(()->{configuration.configure(context);return null;});
}
finally

6
tests/test-webapps/test-jndi-webapp/src/main/java/com/acme/JNDITest.java
View File

@ -51,6 +51,7 @@ public class JNDITest extends HttpServlet
private Double wiggle;
private Integer woggle;
private Double gargle;
private String svr;
private String resourceNameMappingInjectionResult;
private String envEntryOverrideResult;
@ -60,6 +61,7 @@ public class JNDITest extends HttpServlet
private String envEntryWebAppScopeResult;
private String userTransactionResult;
private String mailSessionResult;
private String svrResult;
public void setMyDatasource(DataSource ds)
@ -91,6 +93,9 @@ public class JNDITest extends HttpServlet
woggle = (Integer)ic.lookup("java:comp/env/woggle");
envEntryGlobalScopeResult = "EnvEntry defined in context xml lookup result (java:comp/env/woggle): "+(woggle==4000?"<span class=\"pass\">PASS":"<span class=\"fail\">FAIL(expected 4000, got "+woggle+")")+"</span>";
gargle = (Double)ic.lookup("java:comp/env/gargle");
svr = (String)ic.lookup("java:comp/env/svr");
svrResult = "Ref to Server in jetty-env.xml result: "+(svr!=null?"<span class=\"pass\">PASS":"<span class=\"fail\">FAIL")+"</span>";
envEntryWebAppScopeResult = "EnvEntry defined in jetty-env.xml lookup result (java:comp/env/gargle): "+(gargle==100.0?"<span class=\"pass\">PASS":"<span class=\"fail\">FAIL(expected 100, got "+gargle+")")+"</span>";
UserTransaction utx = (UserTransaction)ic.lookup("java:comp/UserTransaction");
userTransactionResult = "UserTransaction lookup result (java:comp/UserTransaction): "+(utx!=null?"<span class=\"pass\">PASS":"<span class=\"fail\">FAIL")+"</span>";
@ -141,6 +146,7 @@ public class JNDITest extends HttpServlet
out.println("<p>"+preDestroyResult+"</p>");
out.println("<p>"+envEntryGlobalScopeResult+"</p>");
out.println("<p>"+envEntryWebAppScopeResult+"</p>");
out.println("<p>"+svrResult+"</p>");
out.println("<p>"+userTransactionResult+"</p>");
out.println("<p>"+mailSessionResult+"</p>");

13
tests/test-webapps/test-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
View File

@ -27,7 +27,18 @@
</New>
<New class="org.eclipse.jetty.plus.jndi.EnvEntry">
<Arg><Ref refid='wac'/></Arg>
<Arg>svr</Arg>
<Arg type="java.lang.String">
<Ref id="Server">
<Get name="class">
<Get name="name"/>
</Get>
</Ref>
</Arg>
<Arg type="boolean">true</Arg>
</New>
</Configure>