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

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2013-01-25 11:46:16 +11:00
parent ff350c3740 a36c55d7a0
commit eb5bc1c0a7
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-annotations/src/main/config/etc/jetty-annotations.xml
View File

@ -14,6 +14,8 @@
<Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
<Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
<Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
</Array>

4
jetty-distribution/src/main/resources/start.ini
View File

@ -127,11 +127,11 @@ OPTIONS=jsp
#===========================================================
# Annotations JNDI JASS processing
# Annotations JNDI JAAS processing
#-----------------------------------------------------------
# OPTIONS=annotations
# OPTIONS=plus
# etc/jetty-plus.xml
# OPTIONS=annotations
# etc/jetty-annotations.xml
#===========================================================

3
jetty-plus/src/main/config/etc/jetty-plus.xml
View File

@ -67,9 +67,7 @@
<Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
<Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item>
</Array>
<!-- =========================================================== -->
@ -86,7 +84,6 @@
<Set name="monitoredDirName"><Property name="jetty.home" default="." />/webapps-plus</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="scanInterval">5</Set>
<Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
<Set name="parentLoaderPriority">false</Set>
<Set name="extractWars">true</Set>
<Set name="configurationClasses"><Ref id="plusConfig"/></Set>

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

@ -36,10 +36,10 @@ This example shows how to configure and lookup resources such as DataSources, a
webapps/test-jndi.xml
</pre>
</li>
<li>Edit your $JETTY_HOME/start.ini file and add the following lines:
<li>Edit your $JETTY_HOME/start.ini file and uncomment the following lines:
<pre>
OPTIONS=plus
OPTIONS=jta
etc/jetty-plus.xml
</pre>
</li>
</ol>

5
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/webapp/index.html
View File

@ -36,11 +36,12 @@ This example uses and tests newer aspects of the servlet specification such as a
webapps/test-spec.xml
</pre>
</li>
<li>Edit your $JETTY_HOME/start.ini file and add the following lines:
<li>Edit your $JETTY_HOME/start.ini file and uncomment the following lines:
<pre>
OPTIONS=plus
etc/jetty-plus.xml
OPTIONS=annotations
OPTIONS=jta
etc/jetty-annotations.xml
</pre>
</li>
</ol>