Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-13 05:51:55 +0000
committerGreg Wilkins2013-09-13 05:51:55 +0000
commita2a475b4afee79f975f312d46e6f7152e405d409 (patch)
tree5417a5b4ea16e87e01ddc6b78ba0d1cffe11d115 /tests/test-webapps
parentbb8d8fb9998ba6c69a0c2a34a688f7924f3c2e64 (diff)
downloadorg.eclipse.jetty.project-a2a475b4afee79f975f312d46e6f7152e405d409.tar.gz
org.eclipse.jetty.project-a2a475b4afee79f975f312d46e6f7152e405d409.tar.xz
org.eclipse.jetty.project-a2a475b4afee79f975f312d46e6f7152e405d409.zip
minor text cleanups in demo webapps
Diffstat (limited to 'tests/test-webapps')
-rw-r--r--tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html33
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html55
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/webapp/small_powered_by.gifbin0 -> 4787 bytes
-rw-r--r--tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html34
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html13
5 files changed, 71 insertions, 64 deletions
diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html
index 521db42423..a4a5ff9f74 100644
--- a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html
+++ b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html
@@ -7,43 +7,36 @@
</HEAD>
<BODY>
<A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
-
-<p>&nbsp;</p>
- <a href="http://localhost:8080/">Home</a>
-<center>
+ <br/>
+ <b><a href="http://localhost:8080/">Demo Home</a></b>
<hr/>
- <span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span>
-</center>
+ <center><span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span> </center>
<H1>JAAS Authentication and Authorization Demo </H1>
<h2>Preparation</h2>
- <p>To enable JAAS, edit your start.ini or start.d/*.ini files and add the following lines:
+ <p>To enable JAAS in a base jetty instance do:
<pre>
- OPTIONS=jaas
- jaas.login.conf=etc/login.conf
- etc/jetty-jaas.xml
+ $ cd $JETTY_BASE
+ $ java -jar $JETTY_HOME/start.jar --module-startd-ini=jaas
</pre>
</p>
- <p>For the jetty distribution demos, jaas is already enabled in the demo-base/start.ini file and sets the jaas.login.conf property to ${jetty.base}/etc/login.conf for use with the demo-base/webapps/test-jaas.war web application. </p>
+ <p>This will create a $JETTY_BASE/start.d/jaas.ini file to enable and parameterise JAAS. If the --module-start-ini option instead, then the same initialisation will be appended to the
+ $JETTY_BASE/start.ini file instead. The jetty demo-base already has JAAS enabled in the start.ini file. </p>
<p>The full source of this demonstration is available <a
href="http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/tests/test-webapps/test-jaas-webapp">here</a>.</p>
<h2>Using the Demo</h2>
<P>
- Click on the following link to test JAAS <i>authentication</i> and role-based web security constraint <i>authorization</i>.
+ Click on the link below to test JAAS <i>authentication</i> and role-based web security constraint <i>authorization</i>. Use username=&quot;me&quot; with password=&quot;me&quot;. All other usernames, passwords should result in authentication failure.
</P>
+ <big><b><A HREF="auth.html">LOGIN</A></b></big>
<p>
This demo uses a simple login module that stores its configuration in a properties file. There are other types of login module provided with the jetty distro. For full information, please refer to the <a href="http://www.eclipse.org/jetty/documentation/current/">Jetty 9 documentation</a>.
</p>
- <P>
- To authenticate successfully with this demonstration, you must use username=&quot;me&quot; with password=&quot;me&quot;. All other usernames, passwords should result in authentication failure.
- </P>
- <A HREF="auth.html">Login</A>
- <center>
- <hr/>
- <a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a>
- </center>
+ <hr/>
+ <center> <a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a></center>
+
</BODY>
</HTML>
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html
index e7d57b4855..2e7ec1a1f7 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html
+++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html
@@ -10,29 +10,53 @@
</style>
</HEAD>
<BODY>
-<A HREF="http://jetty.eclipse.org"><IMG SRC="jetty_banner.gif"></A>
+ <A HREF="http://www.eclipse.org/jetty"><IMG SRC="jetty_banner.gif"></A>
+ <br/>
+ <b><a href="http://localhost:8080/">Demo Home</a></b>
+ <hr/>
+ <center><span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span> </center>
+
<h1>Welcome to Jetty 9</h1>
<p>
-This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container. It is
-deployed in $JETTY_HOME/webapp.demo and configured by $JETTY_HOME/start.d/900-demo.ini
+This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container.
+It is configured as a jetty base directory in $JETTY_HOME/demo_base.
+</p>
+
+<h2>Jetty Tests:</h2>
+<table border=0>
+<tr valign=top><td>
<ul>
<li>Servet: <a href="hello/">Hello World</a></li>
-<li>Dump: <a href="dump/info">Request</a>, <a href="session/">Session</a>, <a href="cookie/">Cookie</a></li>
+<li>Dump Servlets: <ul>
+ <li><a href="dump/info">Request</a></li>
+ <li><a href="session/">Session</a></li>
+ <li><a href="cookie/">Cookie</a></li>
+ </ul></li>
+<li>Comet Chat Examples:
+ <ul>
+ <li><a href="chat/">Long Polling</a></li>
+ <li><a href="ws">WebSocket (Jetty API)</a></li>
+ <li><a href="javax.websocket">WebSocket (javax.websocket)</a></li>
+ </ul>
+ </li>
<li>JSP: <a href="jsp/">examples</a></li>
-<li>Comet Chat: <a href="chat/">Long Polling</a>, <a href="ws">WebSocket (Jetty API)</a>, <a href="javax.websocket">WebSocket (javax.websocket)</a></li>
+
+</ul></td><td><ul>
<li><a href="auth.html">Authentication</a></li>
<li><a href="dispatch">Dispatcher Servlet</a></li>
<li><a href="rewrite/">Request Rewrite Servlet</a></li>
-<li>static content:
-<a href="d.txt">tiny</a>,
-<a href="da.txt">small</a>,
-<a href="dat.txt">medium</a>,
-<a href="data.txt">large</a>,
-<a href="data.txt.gz">large gziped</a></li>
+<li>Static content: <ul>
+ <li><a href="d.txt">tiny</a></li>
+ <li><a href="da.txt">small</a></li>
+ <li><a href="dat.txt">medium</a></li>
+ <li><a href="data.txt">large</a></li>
+ <li><a href="data.txt.gz">large gziped</a></li>
+ </ul></li>
</ul>
+</td></tr></table>
-<p>
-Useful links are:<ul>
+<h2>Useful links:</h2>
+<ul>
<li><a
href="http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/tests/test-webapps/test-jetty-webapp">Source
tree of this webapp</a></li>
@@ -42,8 +66,7 @@ tree of this webapp</a></li>
</ul>
</p>
-<p>
-<a href="/">MAIN MENU</a>
-</p>
+<hr/>
+<center> <a href="http://www.eclipse.org/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
</BODY>
</HTML>
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/small_powered_by.gif b/tests/test-webapps/test-jetty-webapp/src/main/webapp/small_powered_by.gif
new file mode 100644
index 0000000000..c5dd44319f
--- /dev/null
+++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/small_powered_by.gif
Binary files differ
diff --git a/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html
index d9955c2570..711ad6179d 100644
--- a/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html
+++ b/tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html
@@ -6,34 +6,30 @@
<link rel="stylesheet" type="text/css" href="stylesheet.css"/>
</HEAD>
<BODY>
-<A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
-
-<p>&nbsp;</p>
- <a href="http://localhost:8080/">Home</a>
-<center>
+ <A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
+ <br/>
+ <b><a href="http://localhost:8080/">Demo Home</a></b>
<hr/>
- <span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span>
-</center>
+ <center><span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span> </center>
-<P>
<h1>JNDI Test WebApp</h1>
<p>
This example shows how to configure and lookup resources such as DataSources, a JTA transaction manager and a java.mail.Session in JNDI.
</p>
-<h2>Preparation</h2>
-<p>
-To enable JNDI edit the start.ini or start.d/*.ini files to include "OPTIONS=jndi".
-</p>
-<p>
-For the jetty distribution demos, jndi is already enabled in the modules/demo.mod file and also enables various configurations in
-the demo directory which includes some mock resources used by the test.
-</p>
+ <h2>Preparation</h2>
+ <p>To enable JNDI in a base jetty instance do:
+ <pre>
+ $ cd $JETTY_BASE
+ $ java -jar $JETTY_HOME/start.jar --module-startd-ini=jndi
+ </pre>
+ </p>
+ <p>This will create a $JETTY_BASE/start.d/jndi.ini file to enable and parameterise JNDI. If the --module-start-ini option instead, then the same initialisation will be appended to the
+ $JETTY_BASE/start.ini file instead. The jetty demo-base already has JNDI enabled in the start.ini file and some mock resources included. </p>
<p>The full source of this demonstration is available <a href="http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/tests/test-webapps/test-jndi-webapp">here</a>.</p>
-
<h2>Execution</h2>
<p>
Click <code>Test</code> to check the runtime lookup of the JNDI resources.
@@ -43,10 +39,8 @@ Click <code>Test</code> to check the runtime lookup of the JNDI resources.
</form>
-<center>
<hr/>
- <a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a>
-</center>
+ <center> <a href="http://www.eclipse.org/jetty"><img style="border:0" src="images/small_powered_by.gif"/></a> </center>
</BODY>
</HTML>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html
index 405b05f856..d3ec487e46 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html
@@ -6,15 +6,12 @@
<link rel="stylesheet" type="text/css" href="stylesheet.css"/>
</HEAD>
<BODY >
-<A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
-
-<p>&nbsp;</p>
- <a href="http://localhost:8080/">Home</a>
-<center>
+ <A HREF="http://www.eclipse.org/jetty"><IMG SRC="images/jetty_banner.gif"></A>
+ <br/>
+ <b><a href="http://localhost:8080/">Demo Home</a></b>
<hr/>
- <span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span>
-</center>
-<P>
+ <center><span style="color:red; font-variant:small-caps; font-weight:bold">Test Web Application Only - Do NOT Deploy in Production</span> </center>
+
<h1>Servlet 3.1 Test WebApp</h1>
<p>

Back to the top