dion 2002/06/11 19:49:15 Modified: src/java/org/apache/maven/build PropertyResolver.java Added: src/test/org/apache/maven/build PropertyResolverTest.java Log: Started work on the resolution of properties, along with tests Revision Changes Path 1.1 jakarta-turbine-maven/src/test/org/apache/maven/build/PropertyResolverTest.java Index: PropertyResolverTest.java =================================================================== package org.apache.maven.build; /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" and * "Apache Maven" must not be used to endorse or promote products * derived from this software without prior written permission. For * written permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", * "Apache Maven", nor may "Apache" appear in their name, without * prior written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * * ==================================================================== */ import junit.framework.TestCase; /** * Unit tests for {@link PropertyResolver} * * @author dion * @version $Id: PropertyResolverTest.java,v 1.1 2002/06/12 02:49:15 dion Exp $ */ public class PropertyResolverTest extends TestCase { PropertyResolver instance; /** Creates a new instance of the test case * @param testName the name of the test */ public PropertyResolverTest(String testName) { super(testName); } /** * Initialize per test data * @throws Exception when there is an unexpected problem */ public void setUp() throws Exception { instance = new PropertyResolver(); } /** test that properties can't be found */ public void testNoProperties() { assertNull("get property for non-existing one returns a value", instance.getProperty("foobar")); } /** test simple string properties can be added and retrieved */ public void testStringProperties() { String name = "dummyName"; String value = "dummyValue"; assertNull(name + " property already exists", instance.getProperty(name)); instance.setProperty(name, value); assertEquals("get or set of property failed for: " + name, value, instance.getProperty(name)); } } 1.2 +51 -1 jakarta-turbine-maven/src/java/org/apache/maven/build/PropertyResolver.java Index: PropertyResolver.java =================================================================== RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/build/PropertyResolver.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PropertyResolver.java 11 Jun 2002 04:04:33 -0000 1.1 +++ PropertyResolver.java 12 Jun 2002 02:49:15 -0000 1.2 @@ -55,7 +55,10 @@ * * ==================================================================== */ +import java.io.File; +import org.apache.maven.jelly.JellyAntProject; +import org.apache.tools.ant.taskdefs.Property; /** * Class to handle 'property' resolution during maven builds. @@ -72,10 +75,57 @@ */ public class PropertyResolver { + /** use a jelly/ant combo to resolve stuff */ + JellyAntProject resolver = new JellyAntProject(); /** Creates a new instance of PropertyResolver */ public PropertyResolver() { } + /** + * load and resolve properties from a properties file + * + * @see java.util.Properties + * @see org.apache.tools.ant.taskdefs.Property + */ + public void addPropertiesFromFile(String fileName) + { + Property property = (Property)resolver.createTask("property"); + property.setDescription("PropertyResolver.addPropertiesFromFile"); + property.setFile(new File(fileName)); + property.setProject(resolver); + property.execute(); + } + + /** + * Retrieve a property by name + * + * @param propertyName the name of the property to retrieve + * @return the value of the named property, or null if it doesn't exist + */ + public String getProperty(String propertyName) + { + return resolver.getProperty(propertyName); + } + + /** + * Set a named property to the given value. If the value is a string, + * simply pass it to the resolver's setProperty method. + * If it is any other object, place it in the resolver's context + * + * @param name the name of the property + * @param value the object ot be associated with the name + */ + public void setProperty(String name, Object value) + { + if (value instanceof String) + { + resolver.setProperty(name, (String)value); + } + else + { + resolver.getJexlContext().getVars().put(name, value); + } + } }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
