You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/08/16 13:57:15 UTC
svn commit: r1805200 - in /myfaces/core/branches/2.3.x/impl: pom.xml
src/main/conf/META-INF/myfaces_core-base.tld
src/main/resources/META-INF/web-fragment.xml
Author: tandraschko
Date: Wed Aug 16 13:57:15 2017
New Revision: 1805200
URL: http://svn.apache.org/viewvc?rev=1805200&view=rev
Log:
MYFACES-3844 move StartupServletContextListener config to web-fragment.xml
Added:
myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/web-fragment.xml
Removed:
myfaces/core/branches/2.3.x/impl/src/main/conf/META-INF/myfaces_core-base.tld
Modified:
myfaces/core/branches/2.3.x/impl/pom.xml
Modified: myfaces/core/branches/2.3.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/pom.xml?rev=1805200&r1=1805199&r2=1805200&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/pom.xml (original)
+++ myfaces/core/branches/2.3.x/impl/pom.xml Wed Aug 16 13:57:15 2017
@@ -209,7 +209,6 @@
<id>makecoretld</id>
<configuration>
<xmlFile>META-INF/myfaces_core.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/myfaces_core-base.tld</xmlBaseFile>
<templateFile>myfaces_core12.vm</templateFile>
<modelIds>
<modelId>myfaces-api</modelId>
@@ -260,7 +259,6 @@
<configuration>
<outputDirectory>${project.build.directory}/tlddoc-facelets</outputDirectory>
<xmlFile>myfaces_facelets_core.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/myfaces_core-base.tld</xmlBaseFile>
<templateFile>myfaces_facelet_core20.vm</templateFile>
<modelIds>
<modelId>myfaces-api</modelId>
Added: myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/web-fragment.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/web-fragment.xml?rev=1805200&view=auto
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/web-fragment.xml (added)
+++ myfaces/core/branches/2.3.x/impl/src/main/resources/META-INF/web-fragment.xml Wed Aug 16 13:57:15 2017
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<web-fragment version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd">
+
+ <name>myfaces_core</name>
+
+ <distributable/>
+
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
+
+ <ordering>
+ <after>
+ <others/>
+ </after>
+ </ordering>
+</web-fragment>
\ No newline at end of file