You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/03/01 11:33:56 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder DefaultProjectBuilder.java
donaldp 02/03/01 02:33:56
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
Log:
Decouple exceptions from CascadingException
Revision Changes Path
1.34 +6 -8 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DefaultProjectBuilder.java 1 Mar 2002 02:13:35 -0000 1.33
+++ DefaultProjectBuilder.java 1 Mar 2002 10:33:56 -0000 1.34
@@ -17,7 +17,6 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.excalibur.util.StringUtil;
-import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.Version;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -34,7 +33,7 @@
* Default implementation to construct project from a build file.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.33 $ $Date: 2002/03/01 02:13:35 $
+ * @version $Revision: 1.34 $ $Date: 2002/03/01 10:33:56 $
* @ant:type type="project-builder" name="xml"
* @ant:type type="project-builder" name="ant"
*/
@@ -57,7 +56,6 @@
*
* @param source the source
* @return the constructed Project
- * @exception IOException if an error occurs
* @exception Exception if an error occurs
*/
public Project build( final String source )
@@ -115,7 +113,7 @@
* @param file the file from which configuration was loaded
* @param configuration the configuration loaded
* @return the created Project
- * @exception IOException if an error occurs
+ * @exception Exception if an error occurs
* @exception Exception if an error occurs
* @exception ConfigurationException if an error occurs
*/
@@ -172,7 +170,7 @@
* Throw exceptions with meaningful errors if malformed or missing.
*/
private Version getVersion( final Configuration configuration )
- throws CascadingException
+ throws Exception
{
try
{
@@ -182,7 +180,7 @@
catch( final ConfigurationException ce )
{
final String message = REZ.getString( "ant.version-missing.error" );
- throw new CascadingException( message, ce );
+ throw new ConfigurationException( message, ce );
}
}
@@ -190,7 +188,7 @@
* Utility function to extract version
*/
private Version parseVersion( final String versionString )
- throws CascadingException
+ throws Exception
{
try
@@ -202,7 +200,7 @@
final String message =
REZ.getString( "ant.malformed.version", versionString );
getLogger().warn( message );
- throw new CascadingException( message, e );
+ throw new ConfigurationException( message, e );
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>