CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util ConfigUtil.java,1.3,1.4 ConfigurationBuilder.java,1.2,1.3 ConfigurationConverter.java,1.3,1.4 ExtensionFileFilter.java,1.2,1.3 PropertyUtil.java,1.3,1.4 ResourceUtil.java,1.3,1.4
Peter Donald <pdonald-yCVjj/[email protected]> Sat, 29 Nov 2003 07:45:00 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util
In directory hogshead.codehaus.org:/tmp/cvs-serv31016/loom/engine/src/java/org/jcontainer/loom/components/util
Modified Files:
ConfigUtil.java ConfigurationBuilder.java
ConfigurationConverter.java ExtensionFileFilter.java
PropertyUtil.java ResourceUtil.java
Log Message:
Remove email addie
Index: ConfigUtil.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ConfigUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ConfigUtil.java 5 Oct 2003 13:52:08 -0000 1.3
+++ ConfigUtil.java 29 Nov 2003 13:44:27 -0000 1.4
@@ -14,8 +14,7 @@
import org.realityforge.configkit.PropertyExpander;
/**
- *
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
* @version $Revision$ $Date$
*/
public class ConfigUtil
@@ -28,7 +27,10 @@
return expandValues( expander, input, data );
}
- private static Configuration expandValues( final PropertyExpander expander, final Configuration input, final Map data ) throws Exception
+ private static Configuration expandValues( final PropertyExpander expander,
+ final Configuration input,
+ final Map data )
+ throws Exception
{
final DefaultConfiguration output =
new DefaultConfiguration( input.getName(),
Index: ConfigurationBuilder.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ConfigurationBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ConfigurationBuilder.java 16 Oct 2003 14:45:46 -0000 1.2
+++ ConfigurationBuilder.java 29 Nov 2003 13:44:27 -0000 1.3
@@ -31,16 +31,14 @@
/**
* Utility class used to load Configuration trees from XML files.
*
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
* @version $Revision$ $Date$
*/
public class ConfigurationBuilder
{
public static final String ASSEMBLY_SCHEMA = "-//LOOM/Assembly DTD Version 1.0//EN";
- /**
- * The resolver that builder uses.
- */
+ /** The resolver that builder uses. */
private static EntityResolver c_resolver;
/**
@@ -67,24 +65,27 @@
}
else
{
- final InputSource inputSource = c_resolver.resolveEntity( publicId, null );
+ final InputSource inputSource = c_resolver.resolveEntity( publicId,
+ null );
if( null == inputSource )
{
- final String message = "Unable to locate schema with publicID=" + publicId;
+ final String message = "Unable to locate schema with publicID=" +
+ publicId;
throw new IllegalStateException( message );
}
final ConfigValidator validator =
ConfigValidatorFactory.create( inputSource, c_resolver );
- final ValidationResult result = validator.validate( input, (ContentHandler)handler );
+ final ValidationResult result = validator.validate( input,
+ (ContentHandler)handler );
processValidationResults( result, logger );
}
return handler.getConfiguration();
}
/**
- * Process validation results. Print out any warnings or
- * errors and if validation failed then throw an exception.
+ * Process validation results. Print out any warnings or errors and if
+ * validation failed then throw an exception.
*
* @param result the validation results
* @param logger the logger to print messages to
@@ -101,7 +102,9 @@
{
final ValidationIssue issue = issues[ i ];
final SAXParseException exception = issue.getException();
- final String message = exception.getMessage() + " on line " + exception.getLineNumber();
+ final String message = exception.getMessage() +
+ " on line " +
+ exception.getLineNumber();
if( issue.isWarning() )
{
logger.info( message );
@@ -126,7 +129,8 @@
if( null == c_resolver )
{
c_resolver =
- ResolverFactory.createResolver( ConfigurationBuilder.class.getClassLoader() );
+ ResolverFactory.createResolver(
+ ConfigurationBuilder.class.getClassLoader() );
}
}
}
Index: ConfigurationConverter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ConfigurationConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ConfigurationConverter.java 16 Oct 2003 05:48:07 -0000 1.3
+++ ConfigurationConverter.java 29 Nov 2003 13:44:27 -0000 1.4
@@ -11,15 +11,16 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
/**
- * Utility class to convert DNA Configuration objects
- * into Avalon Configuraiton objects.
+ * Utility class to convert DNA Configuration objects into Avalon Configuraiton
+ * objects.
*
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
* @version $Revision$ $Date$
*/
public class ConfigurationConverter
{
- public static Configuration toConfiguration( final org.jcontainer.dna.Configuration configuration )
+ public static Configuration toConfiguration(
+ final org.jcontainer.dna.Configuration configuration )
{
final DefaultConfiguration result =
new DefaultConfiguration( configuration.getName(),
Index: ExtensionFileFilter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ExtensionFileFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ExtensionFileFilter.java 5 Oct 2003 00:31:36 -0000 1.2
+++ ExtensionFileFilter.java 29 Nov 2003 13:44:27 -0000 1.3
@@ -11,8 +11,7 @@
import java.io.FilenameFilter;
/**
- *
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
* @version $Revision$ $Date$
*/
public class ExtensionFileFilter
Index: PropertyUtil.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/PropertyUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PropertyUtil.java 5 Oct 2003 13:47:12 -0000 1.3
+++ PropertyUtil.java 29 Nov 2003 13:44:27 -0000 1.4
@@ -92,7 +92,7 @@
/**
* This provides utility methods for properties.
*
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
* @version CVS $Revision$ $Date$
* @since 4.0
*/
@@ -103,14 +103,15 @@
}
/**
- * Resolve a string property. This evaluates all property
- * substitutions based on specified context.
+ * Resolve a string property. This evaluates all property substitutions
+ * based on specified context.
*
* @param property the property to resolve
* @param context the context in which to resolve property
- * @param ignoreUndefined if false will throw an PropertyException if property is not found
+ * @param ignoreUndefined if false will throw an PropertyException if
+ * property is not found
* @return the reolved property
- * @exception java.lang.Exception if an error occurs
+ * @throws java.lang.Exception if an error occurs
*/
public static Object resolveProperty( final String property,
final Context context,
@@ -163,13 +164,15 @@
return sb.toString();
}
- private static int findBeginning( final String property, final int currentPosition )
+ private static int findBeginning( final String property,
+ final int currentPosition )
{
//TODO: Check if it is commented out
return property.indexOf( "${", currentPosition );
}
- private static int findEnding( final String property, final int currentPosition )
+ private static int findEnding( final String property,
+ final int currentPosition )
throws Exception
{
//TODO: Check if it is commented out
@@ -183,15 +186,15 @@
}
/**
- * Retrieve a value from the specified context using the specified key.
- * If there is no such value and ignoreUndefined is not false then a
- * Exception is generated.
+ * Retrieve a value from the specified context using the specified key. If
+ * there is no such value and ignoreUndefined is not false then a Exception
+ * is generated.
*
* @param key the key of value in context
* @param context the Context
* @param ignoreUndefined true if undefined variables are ignored
* @return the object retrieved from context
- * @exception java.lang.Exception if an error occurs
+ * @throws java.lang.Exception if an error occurs
*/
private static Object resolveValue( final String key,
final Context context,
@@ -217,7 +220,9 @@
}
else
{
- throw new Exception( "Unable to find " + key + " to expand during "
+ throw new Exception( "Unable to find " +
+ key +
+ " to expand during "
+ "property resolution." );
}
}
Index: ResourceUtil.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ResourceUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ResourceUtil.java 5 Oct 2003 03:25:09 -0000 1.3
+++ ResourceUtil.java 29 Nov 2003 13:44:27 -0000 1.4
@@ -93,7 +93,7 @@
/**
* A utility class for working with resources in default sar layout.
*
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
* @version $Revision$ $Date$
*/
public class ResourceUtil
@@ -104,12 +104,11 @@
private static final String LIB = SAR_INF + "lib";
/**
- * Expand any URLs with sar: protocol so that
- * they accurately match the actual location
+ * Expand any URLs with sar: protocol so that they accurately match the
+ * actual location
*
* @param codeBase the input url
- * @return the result url, modified to file url if it
- * is protocol "sar:"
+ * @return the result url, modified to file url if it is protocol "sar:"
* @throws LoomException if invalidly specified URL
*/
public static String expandSarURL( final String codeBase,