Author: brett Date: Tue Jan 25 05:08:00 2005 New Revision: 126379 URL: http://svn.apache.org/viewcvs?view=rev&rev=126379 Log: cleaner initialisation Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java Url: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java?view=diff&rev=126379&p1=maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java&r1=126378&p2=maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java&r2=126379 ============================================================================== --- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java (original) +++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java Tue Jan 25 05:08:00 2005 @@ -112,23 +112,10 @@ registerTagLibrary( "jelly:mavenant", jeezTagLib ); registerTagLibrary( "", jeezTagLib ); - // Avoid circular dependency - TODO: look for a better alternative! - try + // Avoid circular dependency + if ( !isTagLibraryRegistered( "jelly:maven" ) ) { - Class clazz = Class.forName( "org.apache.maven.jelly.tags.maven.MavenTagLibrary" ); - registerTagLibrary( "jelly:maven", (TagLibrary) clazz.newInstance() ); - } - catch ( InstantiationException e ) - { - log.fatal( "Unable to create maven tag library: scripts will fail", e ); - } - catch ( IllegalAccessException e ) - { - log.fatal( "Unable to create maven tag library: scripts will fail", e ); - } - catch ( ClassNotFoundException e ) - { - log.fatal( "Unable to create maven tag library: scripts will fail", e ); + registerTagLibrary( "jelly:maven", "org.apache.maven.jelly.tags.maven.MavenTagLibrary" ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
