MARMOTTA-573: Modify jetty-web.xml configs for jetty 7.x+
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f8d7e0e8 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f8d7e0e8 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f8d7e0e8 Branch: refs/heads/master Commit: f8d7e0e8c7128e8ea491411b6741c50a212b9d03 Parents: 9b4e0a8 Author: Mark A. Matienzo <[email protected]> Authored: Sat Nov 15 19:21:40 2014 -0500 Committer: Mark A. Matienzo <[email protected]> Committed: Mon Nov 24 10:33:50 2014 -0500 ---------------------------------------------------------------------- .../src/main/webapp/META-INF/jetty-web.xml | 5 ++-- .../src/main/webapp/WEB-INF/jetty-web.xml | 24 ++++++++++++-------- .../src/main/webapp/META-INF/jetty-web.xml | 5 ++-- .../src/main/webapp/WEB-INF/jetty-web.xml | 24 ++++++++++++-------- 4 files changed, 36 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f8d7e0e8/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml index a5c38d0..86fbc46 100644 --- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml +++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/META-INF/jetty-web.xml @@ -21,9 +21,10 @@ limitations under the License. --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd";> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" + "http://www.eclipse.org/jetty/configure.dtd";> -<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> +<Configure id="webAppCtx" class="org.eclipse.jetty.webapp.WebAppContext"> <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process"> <Arg><Ref id="webAppCtx"/></Arg> </Call> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f8d7e0e8/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml index 0ec4d0e..8e6b96a 100644 --- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml +++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml @@ -18,20 +18,26 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" - "http://jetty.mortbay.org/configure.dtd";> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" + "http://www.eclipse.org/jetty/configure.dtd";> -<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> +<Configure id="webAppCtx" class="org.eclipse.jetty.webapp.WebAppContext"> + + <Set name="serverClasses"> + <Array type="java.lang.String"> + <Item>-org.eclipse.jetty.servlet.ServletContextHandler.Decorator</Item> + </Array> + </Set> <Array id="annotationConfig" type="java.lang.String"> - <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item> - <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item> - <Item>org.mortbay.jetty.annotations.Configuration</Item> <!-- Enables annotation support --> - <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item> - <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item> + <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item> + <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> + <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item> <!-- Enables annotation support --> + <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item> + <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item> </Array> - <Call class="org.jboss.weld.environment.jetty.MortbayWeldServletHandler" name="process"> + <Call class="org.jboss.weld.environment.jetty.EclipseWeldServletHandler" name="process"> <Arg><Ref id="webAppCtx"/></Arg> </Call> </Configure> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f8d7e0e8/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml b/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml index db9e86e..3f4465b 100644 --- a/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml +++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/jetty-web.xml @@ -18,9 +18,10 @@ limitations under the License. --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd";> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" + "http://www.eclipse.org/jetty/configure.dtd";> -<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> +<Configure id="webAppCtx" class="org.eclipse.jetty.webapp.WebAppContext"> <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process"> <Arg><Ref id="webAppCtx"/></Arg> </Call> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f8d7e0e8/launchers/marmotta-webapp/src/main/webapp/WEB-INF/jetty-web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/jetty-web.xml index df4c63e..f9658d0 100644 --- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -17,20 +17,26 @@ limitations under the License. --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" - "http://jetty.mortbay.org/configure.dtd";> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" + "http://www.eclipse.org/jetty/configure.dtd";> -<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> +<Configure id="webAppCtx" class="org.eclipse.jetty.webapp.WebAppContext"> + + <Set name="serverClasses"> + <Array type="java.lang.String"> + <Item>-org.eclipse.jetty.servlet.ServletContextHandler.Decorator</Item> + </Array> + </Set> <Array id="annotationConfig" type="java.lang.String"> - <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item> - <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item> - <Item>org.mortbay.jetty.annotations.Configuration</Item> <!-- Enables annotation support --> - <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item> - <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item> + <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item> + <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> + <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item> <!-- Enables annotation support --> + <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item> + <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item> </Array> - <Call class="org.jboss.weld.environment.jetty.MortbayWeldServletHandler" name="process"> + <Call class="org.jboss.weld.environment.jetty.EclipseWeldServletHandler" name="process"> <Arg><Ref id="webAppCtx"/></Arg> </Call> </Configure>
