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

Issue #367 Resolve remaining git.eclipse.org build references

This commit is contained in:
Jesse McConnell 2016-02-26 08:03:33 -06:00 committed by Joakim Erdfelt
parent b08f177d47
commit c74b0c23e9
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aggregates/jetty-websocket-all/pom.xml
View File

@ -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>

4
jetty-server/src/main/config/modules/ssl.mod
View File

@ -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

4
jetty-start/src/test/resources/dist-home/modules/ssl.mod
View File

@ -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

4
tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html
View File

@ -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>

4
tests/test-webapps/test-jndi-webapp/src/main/webapp/index.html
View File

@ -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>