From ant-dev-return-35012-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org Thu Jul 04 00:19:20 2002 Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 95357 invoked from network); 4 Jul 2002 00:19:20 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 4 Jul 2002 00:19:20 -0000 Received: (qmail 25077 invoked by uid 97); 4 Jul 2002 00:19:34 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 25061 invoked by uid 97); 4 Jul 2002 00:19:33 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 25050 invoked by uid 97); 4 Jul 2002 00:19:33 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 4 Jul 2002 00:19:17 -0000 Message-ID: <20020704001917.65828.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-ant-myrmidon-cvs@apache.org Subject: cvs commit: jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework ExecuteTarget.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 2002/07/03 17:19:17 Modified: framework/src/java/org/apache/myrmidon/framework ExecuteTarget.java Log: Dont copy "protected" properties into child ants Revision Changes Path 1.28 +14 -2 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java Index: ExecuteTarget.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ExecuteTarget.java 2 Jul 2002 07:52:24 -0000 1.27 +++ ExecuteTarget.java 4 Jul 2002 00:19:17 -0000 1.28 @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Arrays; +import java.util.Iterator; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; @@ -30,6 +31,7 @@ { private static final Resources REZ = ResourceManager.getPackageResources( ExecuteTarget.class ); + private static final String PROTECTED_PROPERTY_PREFIX = "myrmidon."; private boolean m_inheritAll; private ProjectDescriptor m_project; @@ -140,7 +142,17 @@ // Add the properties from the current project if( m_inheritAll ) { - parameters.putAll( context.getProperties() ); + final Map properties = context.getProperties(); + final Iterator keys = properties.keySet().iterator(); + while( keys.hasNext() ) + { + final String key = (String)keys.next(); + final Object value = properties.get( key ); + if( !key.startsWith( PROTECTED_PROPERTY_PREFIX ) ) + { + parameters.put( key, value ); + } + } } // Add the overrides -- To unsubscribe, e-mail: For additional commands, e-mail: