brett 2004/03/24 21:04:03
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginScriptParser.java
Log:
PR: MAVEN-1161
parse j:import again
Revision Changes Path
No revision
No revision
1.1.4.8 +32 -0 maven/src/java/org/apache/maven/plugin/PluginScriptParser.java
Index: PluginScriptParser.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginScriptParser.java,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -r1.1.4.7 -r1.1.4.8
--- PluginScriptParser.java 23 Mar 2004 23:40:41 -0000 1.1.4.7
+++ PluginScriptParser.java 25 Mar 2004 05:04:03 -0000 1.1.4.8
@@ -93,6 +93,38 @@
*/
public void startElement( String uri, String localName, String rawName,
Attributes attributes )
{
+ if ( uri.equals( "jelly:core" ) && localName.equals( "import" ) )
+ {
+ String importUri = attributes.getValue( "uri" );
+ if ( importUri == null )
+ {
+ importUri = attributes.getValue( "file" );
+ }
+ if ( importUri == null )
+ {
+ log.warn( rawName + " does not have a uri in " +
jellyScriptHousing.getName() );
+ }
+ else
+ {
+ log.debug( rawName + " importing from uri " + importUri );
+ try
+ {
+ jellyScriptHousing.parse( handler, new FileInputStream(
importUri ) );
+ }
+ catch ( ParserConfigurationException e )
+ {
+ log.warn( "Error parsing content from uri " + importUri, e );
+ }
+ catch ( SAXException e )
+ {
+ log.warn( "Error parsing content from uri " + importUri, e );
+ }
+ catch ( IOException e )
+ {
+ log.debug( "Skipping: error reading from uri " + importUri );
+ }
+ }
+ }
// TODO: only honour for maven.xml
if ( rawName.equals( "project" ) )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
