Author: markt
Date: Tue Dec 4 22:08:26 2012
New Revision: 1417218
URL: http://svn.apache.org/viewvc?rev=1417218&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54245
Keep git happy about a currently empty directory
Added:
tomcat/trunk/res/META-INF/default/.gitignore
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1417218&r1=1417217&r2=1417218&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Dec 4 22:08:26 2012
@@ -2672,7 +2672,8 @@ Read the Building page on the Apache Tom
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</fileset>
- <zipfileset dir="@{meta-inf}" prefix="META-INF/" />
+ <zipfileset dir="@{meta-inf}" prefix="META-INF/"
+ excludes=".gitignore" />
<zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
<zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
</jar>
Added: tomcat/trunk/res/META-INF/default/.gitignore
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/default/.gitignore?rev=1417218&view=auto
==============================================================================
--- tomcat/trunk/res/META-INF/default/.gitignore (added)
+++ tomcat/trunk/res/META-INF/default/.gitignore Tue Dec 4 22:08:26 2012
@@ -0,0 +1,24 @@
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+# Git ignores empty directories and the unit tests require this directory to
+# be present for the welcome file tests to pass. The presence of this file
+# doesn't break the unit tests.
+#
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
