diff options
author | Jesse McConnell | 2016-02-26 14:03:33 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2016-02-26 15:11:27 +0000 |
commit | c74b0c23e951a8a48b5caa73b2e9743331fd353c (patch) | |
tree | e7b6bca09ffdb109d2ef905dc7eea8b6038ebc23 | |
parent | b08f177d47d08950ef814f8a6a08450ced7f3c53 (diff) | |
download | org.eclipse.jetty.project-c74b0c23e951a8a48b5caa73b2e9743331fd353c.tar.gz org.eclipse.jetty.project-c74b0c23e951a8a48b5caa73b2e9743331fd353c.tar.xz org.eclipse.jetty.project-c74b0c23e951a8a48b5caa73b2e9743331fd353c.zip |
Issue #367 Resolve remaining git.eclipse.org build references
5 files changed, 5 insertions, 13 deletions
diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml index a6931c70f3..9631dd37e7 100644 --- a/aggregates/jetty-websocket-all/pom.xml +++ b/aggregates/jetty-websocket-all/pom.xml @@ -70,7 +70,7 @@ <url>http://eclipse.org/jetty</url> <Built-By>${user.name}</Built-By> <package>org.eclipse.jetty</package> - <Bundle-License>https://github.com/eclipse/jetty.project/blob/master/NOTICE.txt</Bundle-License> + <Bundle-License>https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt</Bundle-License> <Bundle-Name>Jetty</Bundle-Name> </manifestEntries> </archive> diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod index 2e90560f7d..a2fdfd1444 100644 --- a/jetty-server/src/main/config/modules/ssl.mod +++ b/jetty-server/src/main/config/modules/ssl.mod @@ -9,11 +9,7 @@ server etc/jetty-ssl.xml [files] -<<<<<<< HEAD -http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore -======= https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore ->>>>>>> 76b34fe... Issue #367 Resolve remaining git.eclipse.org build references [ini-template] ### SSL Keystore Configuration diff --git a/jetty-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod index 2e90560f7d..a2fdfd1444 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod +++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod @@ -9,11 +9,7 @@ server etc/jetty-ssl.xml [files] -<<<<<<< HEAD -http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore -======= https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore ->>>>>>> 76b34fe... Issue #367 Resolve remaining git.eclipse.org build references [ini-template] ### SSL Keystore Configuration 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 b2289c5992..d7d2a3a54f 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 @@ -18,7 +18,7 @@ <h1>Welcome to Jetty 9</h1> <p> -This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container. +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> @@ -32,7 +32,7 @@ It is configured as a jetty base directory in $JETTY_HOME/demo_base. <li><a href="session/">Session</a></li> <li><a href="cookie/">Cookie</a></li> </ul></li> -<li>Comet Chat Examples: +<li>Comet Chat Examples: <ul> <li><a href="chat/">Long Polling</a></li> <li><a href="ws">WebSocket (Jetty API)</a></li> 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 978ade76bf..7ae0c6d768 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 @@ -15,7 +15,7 @@ <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. +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> @@ -27,7 +27,7 @@ This example shows how to configure and lookup resources such as DataSources, a </p> <p>This will create a $JETTY_BASE/start.d/jndi.ini file to enable and parameterise JNDI. If the --add-to-start 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="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/test-jndi-webapp">here</a>.</p> +<p>The full source of this demonstration is available <a href="https://github.com/eclipse/jetty.project/blob/master/tree/tests/test-webapps/test-jndi-webapp">here</a>.</p> <h2>Execution</h2> |