brett 2004/03/23 15:40:41
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginScriptParser.java
Log:
revert changes for maven-1161. Its rarely useful and is problematic because
we can't evaluate any expressions in the URI.
Revision Changes Path
No revision
No revision
1.1.4.7 +0 -30 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.6
retrieving revision 1.1.4.7
diff -u -r1.1.4.6 -r1.1.4.7
--- PluginScriptParser.java 23 Mar 2004 02:56:59 -0000 1.1.4.6
+++ PluginScriptParser.java 23 Mar 2004 23:40:41 -0000 1.1.4.7
@@ -51,9 +51,6 @@
/** Storage of defined dynamic tag libraries. */
private final Set dynaTagLibDecls = new HashSet();
- /** The bound URI for jelly's core tag library. */
- private String jellyCoreUri = null;
-
/**
* Constructor.
*/
@@ -79,10 +76,6 @@
*/
public void startPrefixMapping( String prefix, String uri )
{
- if ( uri.equals( "jelly:core" ) )
- {
- jellyCoreUri = uri;
- }
if ( !prefix.equals( "" ) && !uri.startsWith( "jelly:" ) &&
!uri.startsWith( "dummy" ) && !uri.equals( "" ) )
{
dynaTagLibDecls.add( uri );
@@ -100,29 +93,6 @@
*/
public void startElement( String uri, String localName, String rawName,
Attributes attributes )
{
- if ( uri.equals( jellyCoreUri ) )
- {
- if ( localName.equals( "import" ) )
- {
- String scriptUri = attributes.getValue( "uri" );
- try
- {
- jellyScriptHousing.parse( handler, new FileInputStream(
scriptUri ) );
- }
- catch ( SAXException e )
- {
- log.warn( "Unable to parse URI '" + scriptUri + "' due to
exception, skipping", e );
- }
- catch ( ParserConfigurationException e )
- {
- log.warn( "Unable to parse URI '" + scriptUri + "' due to
exception, skipping", e );
- }
- catch ( IOException e )
- {
- log.warn( "Unable to read URI '" + scriptUri + "' due to
exception, skipping", e );
- }
- }
- }
// TODO: only honour for maven.xml
if ( rawName.equals( "project" ) )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
