You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/07/01 06:44:56 UTC
cvs commit: avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder XMLLegacyCreator.java XMLTypeCreator.java
mcconnell 2003/06/30 21:44:56
Modified: merlin/meta/src/java/org/apache/avalon/meta/info/builder
XMLLegacyCreator.java XMLTypeCreator.java
Log:
Update meta-info builder to be consitent with respect to exceptions thrown.
Revision Changes Path
1.5 +4 -4 avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java
Index: XMLLegacyCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLLegacyCreator.java 21 Jun 2003 17:42:32 -0000 1.4
+++ XMLLegacyCreator.java 1 Jul 2003 04:44:56 -0000 1.5
@@ -116,10 +116,10 @@
* @param classname The classname of the component
* @param config the meta info configuration fragment
* @return the created Type
- * @throws Exception if an error occurs
+ * @throws ConfigurationException if an error occurs
*/
public Type createType( String classname, Configuration config )
- throws Exception
+ throws ConfigurationException
{
return build( classname, config );
}
@@ -134,7 +134,7 @@
* @throws ConfigurationException if an error occurs
*/
private Type build( final String classname, final Configuration info )
- throws Exception
+ throws ConfigurationException
{
final String topLevelName = info.getName();
if( !topLevelName.equals( "blockinfo" ) )
1.9 +10 -6 avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLTypeCreator.java 21 Jun 2003 17:10:02 -0000 1.8
+++ XMLTypeCreator.java 1 Jul 2003 04:44:56 -0000 1.9
@@ -123,7 +123,7 @@
*/
public Type createType(
final String classname, final Configuration info, final Configuration defaults )
- throws Exception
+ throws ConfigurationException
{
final String topLevelName = info.getName();
@@ -184,7 +184,8 @@
* @return an array of phase descriptors
* @exception Exception if a build error occurs
*/
- protected StageDescriptor[] buildPhases( Configuration config ) throws Exception
+ protected StageDescriptor[] buildPhases( Configuration config )
+ throws ConfigurationException
{
ArrayList list = new ArrayList();
Configuration[] phases = config.getChildren( "stage" );
@@ -202,7 +203,8 @@
* @return an array of phase descriptors
* @exception Exception if a build error occurs
*/
- protected StageDescriptor buildPhase( Configuration config ) throws Exception
+ protected StageDescriptor buildPhase( Configuration config )
+ throws ConfigurationException
{
ReferenceDescriptor reference = createReference( config.getAttribute( "type" ) );
final Properties attributes =
@@ -446,7 +448,8 @@
* @return an array of phase descriptors
* @exception Exception if a build error occurs
*/
- protected ExtensionDescriptor[] buildExtensions( Configuration config ) throws Exception
+ protected ExtensionDescriptor[] buildExtensions( Configuration config )
+ throws ConfigurationException
{
ArrayList list = new ArrayList();
Configuration[] extensions = config.getChildren( "extension" );
@@ -463,7 +466,8 @@
* @return the extension descriptor
* @exception Exception if a build error occurs
*/
- protected ExtensionDescriptor buildExtension( Configuration config ) throws Exception
+ protected ExtensionDescriptor buildExtension( Configuration config )
+ throws ConfigurationException
{
ReferenceDescriptor reference =
createReference( config.getAttribute( "type" ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org