Author: bodewig
Date: Fri Aug 22 08:50:29 2008
New Revision: 688105
URL: http://svn.apache.org/viewvc?rev=688105&view=rev
Log:
Ant disallowed manifest attributes that contained the character 8. PR 45675.
Added:
ant/core/trunk/src/tests/antunit/taskdefs/manifest-test.xml (with props)
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=688105&r1=688104&r2=688105&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Aug 22 08:50:29 2008
@@ -162,6 +162,10 @@
was used.
Bugzilla Report 43892.
+ * <jar> and <manifest> disallowed manifest attributes whose name
+ contained the character '8'.
+ Bugzilla Report 45675.
+
Other changes:
--------------
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java?rev=688105&r1=688104&r2=688105&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java Fri
Aug 22 08:50:29 2008
@@ -50,7 +50,7 @@
* [EMAIL PROTECTED]
*/
public static final String VALID_ATTRIBUTE_CHARS =
- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012345679-_";
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
/**
* Holds the real data.
Added: ant/core/trunk/src/tests/antunit/taskdefs/manifest-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/manifest-test.xml?rev=688105&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/manifest-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/manifest-test.xml Fri Aug 22
08:50:29 2008
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project default="antunit"
+ xmlns:au="antlib:org.apache.ant.antunit">
+
+ <import file="../antunit-base.xml" />
+
+ <property name="file" location="test.mf"/>
+
+ <target name="tearDown">
+ <delete file="${file}"/>
+ </target>
+
+ <target name="test8IsAllowed"
+
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=45675";
+ >
+ <manifest file="${file}">
+ <attribute name="attrib8" value="test attribute"/>
+ </manifest>
+ </target>
+</project>
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/manifest-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
