darrell 02/03/20 14:30:55
Modified: proposal/myrmidon ant1compat.xml
proposal/myrmidon/src/ant1compat README.txt
proposal/myrmidon/src/ant1compat/org/apache/tools/ant
Ant1CompatProject.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/property
ClassicPropertyResolver.java
DefaultPropertyResolver.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultTaskContext.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property
PropertyResolver.java
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test
AbstractPropertyResolverTestCase.java
Added: proposal/myrmidon/src/ant1compat/org/apache/tools/ant
BuildException.java
Log:
Modifications to Ant1 compatibility layer.
* Completed property hooks, so that the underlying Ant1 project
is not used for setting, getting or resolving properties.
* Made PropertyResolver.resolveProperties()take a TaskContext,
instead of Avalon Context. (We can always split out a generic
interface later, if need be.) Ant1 compatibility layer user
ClassicPropertyResolver, which needs a better name.
* Added modified BuildException, which incudes a Myrmidon-friendly
getCause() method, to allow Ant1 exceptions to be properly cascaded.
* DefaultTaskContext:
- Allow "+" in property names.
- Implemented DefaultTaskContext.getProperties()
- No longer implements avalon Context (not needed)
Revision Changes Path
1.3 +1 -0 jakarta-ant/proposal/myrmidon/ant1compat.xml
Index: ant1compat.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/ant1compat.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ant1compat.xml 20 Mar 2002 01:14:26 -0000 1.2
+++ ant1compat.xml 20 Mar 2002 22:30:55 -0000 1.3
@@ -62,6 +62,7 @@
<patternset id="ant1.omit">
<exclude name="${ant1.package}/ant/Main.class"/>
<exclude name="${ant1.package}/ant/Task.class"/>
+ <exclude name="${ant1.package}/ant/BuildException.class"/>
<exclude name="${ant1.package}/ant/types/Path.class"/>
</patternset>
1.3 +3 -5 jakarta-ant/proposal/myrmidon/src/ant1compat/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/ant1compat/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.txt 20 Mar 2002 01:14:26 -0000 1.2
+++ README.txt 20 Mar 2002 22:30:55 -0000 1.3
@@ -18,7 +18,7 @@
The idea is to provide hooks between the Ant1 project and the Myrmidon
project, eg
logging: done
- properties: done but not quite working
+ properties: done
references: not done
Task definitions: done.
@@ -51,10 +51,8 @@
TODO
----
* Convert this to an Xdoc document
-* Try out automatic registration of tasks - remove everything
- from ant-descriptor.xml and just use Project.addTaskDefinition()
- to register tasks? (similar for DataTypes)
* Get a version of <ant> and <antcall> working
* Test heaps more tasks
-* Check that "if" and "unless" conversions are working.
+* Provide hooks between Ant1 references and Myrmidon properties. Need to use
+ converters for adapting Ant2 objects (like Ant2 <path> or <fileset>) as
Ant1 types.
1.3 +254 -2
jakarta-ant/proposal/myrmidon/src/ant1compat/org/apache/tools/ant/Ant1CompatProject.java
Index: Ant1CompatProject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/ant1compat/org/apache/tools/ant/Ant1CompatProject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ant1CompatProject.java 20 Mar 2002 01:14:26 -0000 1.2
+++ Ant1CompatProject.java 20 Mar 2002 22:30:55 -0000 1.3
@@ -7,13 +7,22 @@
*/
package org.apache.tools.ant;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.type.DefaultTypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.property.PropertyResolver;
+import org.apache.myrmidon.components.property.ClassicPropertyResolver;
/**
* Ant1 Project proxy for Myrmidon. Provides hooks between Myrmidon
TaskContext
@@ -23,13 +32,18 @@
* Ant1 original, this class contains the extensions.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/20 01:14:26 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/20 22:30:55 $
*/
public class Ant1CompatProject extends Project
{
- private TaskContext m_context;
public static final String ANT1_TASK_PREFIX = "ant1.";
+ private static final PropertyResolver c_ant1PropertyResolver =
+ new ClassicPropertyResolver();
+
+ private Set m_userProperties = new HashSet();
+ private TaskContext m_context;
+
public Ant1CompatProject( TaskContext context )
{
super();
@@ -242,6 +256,244 @@
TypeManager typeManager = (TypeManager)m_context.getService(
TypeManager.class );
typeManager.registerType( roleType, typeName, factory );
+ }
+
+ /**
+ * Sets a property. Any existing property of the same name
+ * is overwritten, unless it is a user property.
+ * @param name The name of property to set.
+ * Must not be <code>null</code>.
+ * @param value The new value of the property.
+ * Must not be <code>null</code>.
+ */
+ public void setProperty( String name, String value )
+ {
+ if( m_userProperties.contains( name ) )
+ {
+ log( "Override ignored for user property " + name, MSG_VERBOSE );
+ return;
+ }
+
+ if( null != m_context.getProperty( name ) )
+ {
+ log( "Overriding previous definition of property " + name,
+ MSG_VERBOSE );
+ }
+
+ log( "Setting project property: " + name + " -> " +
+ value, MSG_DEBUG );
+ doSetProperty( name, value );
+ }
+
+ /**
+ * Sets a property if no value currently exists. If the property
+ * exists already, a message is logged and the method returns with
+ * no other effect.
+ *
+ * @param name The name of property to set.
+ * Must not be <code>null</code>.
+ * @param value The new value of the property.
+ * Must not be <code>null</code>.
+ * @since 1.5
+ */
+ public void setNewProperty( String name, String value )
+ {
+ if( null != m_context.getProperty( name ) )
+ {
+ log( "Override ignored for property " + name, MSG_VERBOSE );
+ return;
+ }
+
+ log( "Setting project property: " + name + " -> " +
+ value, MSG_DEBUG );
+ doSetProperty( name, value );
+ }
+
+ /**
+ * Sets a user property, which cannot be overwritten by
+ * set/unset property calls. Any previous value is overwritten.
+ * @param name The name of property to set.
+ * Must not be <code>null</code>.
+ * @param value The new value of the property.
+ * Must not be <code>null</code>.
+ * @see #setProperty(String,String)
+ */
+ public void setUserProperty( String name, String value )
+ {
+ log( "Setting ro project property: " + name + " -> " +
+ value, MSG_DEBUG );
+ m_userProperties.add( name );
+ doSetProperty( name, value );
+ }
+
+ /**
+ * Sets a property value in the context, wrapping exceptions as
+ * Ant1 BuildExceptions.
+ * @param name property name
+ * @param value property value
+ */
+ private void doSetProperty( String name, String value )
+ {
+ try
+ {
+ m_context.setProperty( name, value );
+ }
+ catch( TaskException e )
+ {
+ throw new BuildException( "Could not set property: " + name, e );
+ }
+ }
+
+ /**
+ * Returns the value of a property, if it is set.
+ *
+ * @param name The name of the property.
+ * May be <code>null</code>, in which case
+ * the return value is also <code>null</code>.
+ * @return the property value, or <code>null</code> for no match
+ * or if a <code>null</code> name is provided.
+ */
+ public String getProperty( String name )
+ {
+ Object value = m_context.getProperty( name );
+
+ // In Ant1, all properties are strings.
+ if( value instanceof String )
+ {
+ return (String)value;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the value of a user property, if it is set.
+ *
+ * @param name The name of the property.
+ * May be <code>null</code>, in which case
+ * the return value is also <code>null</code>.
+ * @return the property value, or <code>null</code> for no match
+ * or if a <code>null</code> name is provided.
+ */
+ public String getUserProperty( String name )
+ {
+ if( m_userProperties.contains( name ) )
+ {
+ return getProperty( name );
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns a copy of the properties table.
+ * @return a hashtable containing all properties
+ * (including user properties).
+ */
+ public Hashtable getProperties()
+ {
+ Hashtable propsCopy = new Hashtable();
+
+ Map contextProps = m_context.getProperties();
+ Iterator propNames = contextProps.keySet().iterator();
+ while( propNames.hasNext() )
+ {
+ String name = (String)propNames.next();
+
+ // Use getProperty() to only return Strings.
+ String value = getProperty( name );
+ if( value != null )
+ {
+ propsCopy.put( name, value );
+ }
+ }
+
+ return propsCopy;
+ }
+
+ /**
+ * Returns a copy of the user property hashtable
+ * @return a hashtable containing just the user properties
+ */
+ public Hashtable getUserProperties()
+ {
+ Hashtable propsCopy = new Hashtable();
+
+ Iterator userPropNames = m_userProperties.iterator();
+ while( userPropNames.hasNext() )
+ {
+ String name = (String)userPropNames.next();
+ String value = getProperty( name );
+ propsCopy.put( name, value );
+ }
+
+ return propsCopy;
+ }
+
+ /**
+ * Replaces ${} style constructions in the given value with the
+ * string value of the corresponding data types.
+ *
+ * @param value The string to be scanned for property references.
+ * May be <code>null</code>.
+ *
+ * @return the given string with embedded property names replaced
+ * by values, or <code>null</code> if the given string is
+ * <code>null</code>.
+ *
+ * @exception BuildException if the given value has an unclosed
+ * property name, e.g. <code>${xxx</code>
+ */
+ public String replaceProperties( String value )
+ throws BuildException
+ {
+ try
+ {
+ return (String)c_ant1PropertyResolver.resolveProperties( value,
+
m_context );
+ }
+ catch( TaskException e )
+ {
+ throw new BuildException( "Error resolving value: '" + value +
"'", e );
+ }
+ }
+
+ /**
+ * Make the Ant1 project set the java version property, and then
+ * copy it into the context properties.
+ *
+ * @exception BuildException if this Java version is not supported
+ *
+ * @see #getJavaVersion()
+ */
+ public void setJavaVersionProperty() throws BuildException
+ {
+ String javaVersion = getJavaVersion();
+ doSetProperty( "ant.java.version", javaVersion );
+
+ log( "Detected Java version: " + javaVersion + " in: "
+ + System.getProperty( "java.home" ), MSG_VERBOSE );
+
+ log( "Detected OS: " + System.getProperty( "os.name" ), MSG_VERBOSE
);
+ }
+
+ /**
+ * Sets the base directory for the project, checking that
+ * the given filename exists and is a directory.
+ *
+ * @param baseD The project base directory.
+ * Must not be <code>null</code>.
+ *
+ * @exception BuildException if the directory if invalid
+ */
+ public void setBaseDir( File baseD ) throws BuildException
+ {
+ super.setBaseDir( baseD );
+ doSetProperty( "basedir", super.getProperty( "basedir" ) );
}
}
1.1
jakarta-ant/proposal/myrmidon/src/ant1compat/org/apache/tools/ant/BuildException.java
Index: BuildException.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-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 acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" 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"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* 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/>.
*/
package org.apache.tools.ant;
import java.io.PrintWriter;
import java.io.PrintStream;
import org.apache.tools.ant.Location;
/**
*-----------------------------------------------------------------
* Ant1Compatability layer version of BuildException, modified slightly
* from original Ant1 BuildException, to provide a Myrmidon-friendly
* getCause(), so that cascading exceptions are followed.
* -----------------------------------------------------------------
*
* Signals an error condition during a build
*
* @author James Duncan Davidson
*/
public class BuildException extends RuntimeException {
/** Exception that might have caused this one. */
private Throwable cause;
/** Location in the build file where the exception occured */
private Location location = Location.UNKNOWN_LOCATION;
/**
* Constructs a build exception with no descriptive information.
*/
public BuildException() {
super();
}
/**
* Constructs an exception with the given descriptive message.
*
* @param msg A description of or information about the exception.
* Should not be <code>null</code>.
*/
public BuildException(String msg) {
super(msg);
}
/**
* Constructs an exception with the given message and exception as
* a root cause.
*
* @param msg A description of or information about the exception.
* Should not be <code>null</code> unless a cause is specified.
* @param cause The exception that might have caused this one.
* May be <code>null</code>.
*/
public BuildException(String msg, Throwable cause) {
super(msg);
this.cause = cause;
}
/**
* Constructs an exception with the given message and exception as
* a root cause and a location in a file.
*
* @param msg A description of or information about the exception.
* Should not be <code>null</code> unless a cause is specified.
* @param cause The exception that might have caused this one.
* May be <code>null</code>.
* @param location The location in the project file where the error
* occurred. Must not be <code>null</code>.
*/
public BuildException(String msg, Throwable cause, Location location) {
this(msg, cause);
this.location = location;
}
/**
* Constructs an exception with the given exception as a root cause.
*
* @param cause The exception that might have caused this one.
* Should not be <code>null</code>.
*/
public BuildException(Throwable cause) {
super(cause.toString());
this.cause = cause;
}
/**
* Constructs an exception with the given descriptive message and a
* location in a file.
*
* @param msg A description of or information about the exception.
* Should not be <code>null</code>.
* @param location The location in the project file where the error
* occurred. Must not be <code>null</code>.
*/
public BuildException(String msg, Location location) {
super(msg);
this.location = location;
}
/**
* Constructs an exception with the given exception as
* a root cause and a location in a file.
*
* @param cause The exception that might have caused this one.
* Should not be <code>null</code>.
* @param location The location in the project file where the error
* occurred. Must not be <code>null</code>.
*/
public BuildException(Throwable cause, Location location) {
this(cause);
this.location = location;
}
/**
* Returns the nested exception, if any.
*
* @return the nested exception, or <code>null</code> if no
* exception is associated with this one
*/
public Throwable getException() {
return cause;
}
/**
* Returns the location of the error and the error message.
*
* @return the location of the error and the error message
*/
public String toString() {
return location.toString() + getMessage();
}
/**
* Sets the file location where the error occurred.
*
* @param location The file location where the error occurred.
* Must not be <code>null</code>.
*/
public void setLocation(Location location) {
this.location = location;
}
/**
* Returns the file location where the error occurred.
*
* @return the file location where the error occurred.
*/
public Location getLocation() {
return location;
}
/**
* Prints the stack trace for this exception and any
* nested exception to <code>System.err</code>.
*/
public void printStackTrace() {
printStackTrace(System.err);
}
/**
* Prints the stack trace of this exception and any nested
* exception to the specified PrintStream.
*
* @param ps The PrintStream to print the stack trace to.
* Must not be <code>null</code>.
*/
public void printStackTrace(PrintStream ps) {
synchronized (ps) {
super.printStackTrace(ps);
if (cause != null) {
ps.println("--- Nested Exception ---");
cause.printStackTrace(ps);
}
}
}
/**
* Prints the stack trace of this exception and any nested
* exception to the specified PrintWriter.
*
* @param pw The PrintWriter to print the stack trace to.
* Must not be <code>null</code>.
*/
public void printStackTrace(PrintWriter pw) {
synchronized (pw) {
super.printStackTrace(pw);
if (cause != null) {
pw.println("--- Nested Exception ---");
cause.printStackTrace(pw);
}
}
}
//-------------------Modified from Ant1 ---------------------
/**
* Myrmidon-friendly cascading exception method.
* @return the cascading cause of this exception.
*/
public Throwable getCause()
{
return cause;
}
//--------------------- End modified section ---------------
}
1.3 +8 -8
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java
Index: ClassicPropertyResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassicPropertyResolver.java 18 Mar 2002 09:15:10 -0000 1.2
+++ ClassicPropertyResolver.java 20 Mar 2002 22:30:55 -0000 1.3
@@ -7,16 +7,15 @@
*/
package org.apache.myrmidon.components.property;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.myrmidon.interfaces.property.PropertyResolver;
+import org.apache.myrmidon.api.TaskContext;
/**
* A [EMAIL PROTECTED] PropertyResolver} implementation which resolves
properties
* as per Ant1, ignoring undefined properties.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/18 09:15:10 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/20 22:30:55 $
*/
public class ClassicPropertyResolver
extends DefaultPropertyResolver
@@ -30,15 +29,16 @@
* @param context the set of known properties
*/
protected Object getPropertyValue( final String propertyName,
- final Context context )
+ final TaskContext context )
{
- try
+ Object propertyValue = context.getProperty( propertyName );
+ if ( propertyValue == null )
{
- return context.get( propertyName );
+ return "${" + propertyName + "}";
}
- catch( ContextException e )
+ else
{
- return "${" + propertyName + "}";
+ return propertyValue;
}
}
}
1.3 +11 -11
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java
Index: DefaultPropertyResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultPropertyResolver.java 16 Mar 2002 04:08:06 -0000 1.2
+++ DefaultPropertyResolver.java 20 Mar 2002 22:30:55 -0000 1.3
@@ -9,9 +9,8 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.interfaces.property.PropertyResolver;
/**
@@ -19,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/20 22:30:55 $
*/
public class DefaultPropertyResolver
implements PropertyResolver
@@ -43,7 +42,7 @@
* @exception TaskException if an error occurs
*/
public Object resolveProperties( final String content,
- final Context context )
+ final TaskContext context )
throws TaskException
{
int start = findNextProperty( content, 0 );
@@ -100,7 +99,7 @@
* @exception TaskException if an error occurs
*/
private Object recursiveResolveProperty( final String content,
- final Context context )
+ final TaskContext context )
throws TaskException
{
int start = findNextProperty( content, 0 );
@@ -238,17 +237,18 @@
* @exception TaskException if the property is undefined
*/
protected Object getPropertyValue( final String propertyName,
- final Context context )
+ final TaskContext context )
throws TaskException
{
- try
- {
- return context.get( propertyName );
- }
- catch( ContextException e )
+ Object propertyValue = context.getProperty( propertyName );
+ if ( propertyValue == null )
{
final String message = REZ.getString(
"prop.missing-value.error", propertyName );
throw new TaskException( message );
+ }
+ else
+ {
+ return propertyValue;
}
}
}
1.29 +7 -20
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
Index: DefaultTaskContext.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultTaskContext.java 16 Mar 2002 04:08:06 -0000 1.28
+++ DefaultTaskContext.java 20 Mar 2002 22:30:55 -0000 1.29
@@ -10,11 +10,10 @@
import java.io.File;
import java.util.Hashtable;
import java.util.Map;
+import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.FileUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -27,20 +26,22 @@
* Default implementation of TaskContext.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.28 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.29 $ $Date: 2002/03/20 22:30:55 $
*/
public class DefaultTaskContext
- implements TaskContext, Context
+ implements TaskContext
{
private final static Resources REZ =
ResourceManager.getPackageResources( DefaultTaskContext.class );
// Property name validator allows digits, but no internal whitespace.
- private static DefaultNameValidator c_propertyNameValidator = new
DefaultNameValidator();
+ private static DefaultNameValidator c_propertyNameValidator =
+ new DefaultNameValidator();
static
{
c_propertyNameValidator.setAllowInternalWhitespace( false );
+ c_propertyNameValidator.setAdditionalInternalCharacters( "_-.+" );
}
private final Map m_contextData = new Hashtable();
@@ -193,7 +194,7 @@
*/
public Map getProperties()
{
- return null;
+ return new HashMap( m_contextData );
}
/**
@@ -352,20 +353,6 @@
context.setProperty( TaskContext.BASE_DIRECTORY, getBaseDirectory()
);
return context;
- }
-
- /**
- * Returns a property.
- */
- public Object get( final Object key ) throws ContextException
- {
- final Object value = getProperty( (String)key );
- if( value == null )
- {
- final String message = REZ.getString( "unknown-property.error",
key );
- throw new ContextException( message );
- }
- return value;
}
/**
1.3 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java
Index: PropertyResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyResolver.java 18 Mar 2002 09:15:10 -0000 1.2
+++ PropertyResolver.java 20 Mar 2002 22:30:55 -0000 1.3
@@ -7,8 +7,8 @@
*/
package org.apache.myrmidon.interfaces.property;
-import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.api.TaskContext;
/**
*
@@ -16,7 +16,7 @@
* String content.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/18 09:15:10 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/20 22:30:55 $
*/
public interface PropertyResolver
{
@@ -33,6 +33,6 @@
* @exception TaskException if an error occurs
*/
Object resolveProperties( final String value,
- final Context context )
+ final TaskContext context )
throws TaskException;
}
1.2 +4 -4
jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java
Index: AbstractPropertyResolverTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPropertyResolverTestCase.java 17 Mar 2002 08:07:09 -0000
1.1
+++ AbstractPropertyResolverTestCase.java 20 Mar 2002 22:30:55 -0000
1.2
@@ -10,9 +10,9 @@
import java.io.File;
import java.util.Date;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.AbstractMyrmidonTest;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.components.workspace.DefaultTaskContext;
import org.apache.myrmidon.interfaces.property.PropertyResolver;
@@ -20,7 +20,7 @@
* General-purpose property resolver test cases.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/17 08:07:09 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/20 22:30:55 $
*/
public abstract class AbstractPropertyResolverTestCase
extends AbstractMyrmidonTest
@@ -117,7 +117,7 @@
*/
protected void doTestResolution( final String value,
final Object expected,
- final Context context )
+ final TaskContext context )
throws Exception
{
final Object resolved = m_resolver.resolveProperties( value, context
);
@@ -131,7 +131,7 @@
*/
protected void doTestFailure( final String value,
final String expectedErrorMessage,
- final Context context )
+ final TaskContext context )
{
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
