You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2003/12/31 02:40:26 UTC
cvs commit: maven/src/java/org/apache/maven/plugin GoalToJellyScriptHousingMapper.java
brett 2003/12/30 17:40:26
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
GoalToJellyScriptHousingMapper.java
Log:
remove false warning by not processing dynatag uri's that have no prefix
Revision Changes Path
No revision
No revision
1.3.4.2 +11 -6 maven/src/java/org/apache/maven/plugin/Attic/GoalToJellyScriptHousingMapper.java
Index: GoalToJellyScriptHousingMapper.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/Attic/GoalToJellyScriptHousingMapper.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- GoalToJellyScriptHousingMapper.java 26 Nov 2003 11:45:17 -0000 1.3.4.1
+++ GoalToJellyScriptHousingMapper.java 31 Dec 2003 01:40:26 -0000 1.3.4.2
@@ -391,6 +391,7 @@
* Resolve plugins that provide dynamic tags for the given set of plugins.
* @param plugins the plugins containing tags
* @return the plugins providing tags
+ * @todo [RC2] - can "seen" be put outside j loop?
*/
private Set resolveDynaTagPlugins( Set plugins )
{
@@ -398,7 +399,7 @@
for ( Iterator i = plugins.iterator(); i.hasNext(); )
{
- Object plugin = i.next();
+ JellyScriptHousing plugin = ( JellyScriptHousing ) i.next();
Set dynaTagDeps = getPluginDynaTagDeps( plugin );
for ( Iterator j = dynaTagDeps.iterator(); j.hasNext(); )
@@ -406,7 +407,8 @@
LinkedList dynaTagUris = new LinkedList();
Set seen = new HashSet();
- dynaTagUris.add( j.next() );
+ Object next = j.next();
+ dynaTagUris.add( next );
while ( dynaTagUris.isEmpty() == false )
{
@@ -420,14 +422,16 @@
seen.add( dynaTagUri );
Object dynaTagPluginHome = dynaTagPluginMap.get( dynaTagUri );
- dynaTagUris.addAll( getPluginDynaTagDeps( dynaTagPluginHome ) );
- // This is essentially needed for bootstrap so plugins can import taglibs they don't use until later
if ( dynaTagPluginHome == null )
{
- log.warn( "Tag library requested that is not present: '" + dynaTagUri + "'" );
+ // This is essentially allowed for bootstrap so
+ // plugins can import taglibs they don't use until later
+ log.warn( "Tag library requested that is not present: '" + dynaTagUri + "' in plugin: '" + plugin.getId() + "'" );
}
else
{
+ Set set = getPluginDynaTagDeps( dynaTagPluginHome );
+ dynaTagUris.addAll( set );
resolvedDynaTagPlugins.add( dynaTagPluginHome );
}
}
@@ -455,7 +459,7 @@
*/
public void startPrefixMapping( String prefix, String uri )
{
- if ( uri.startsWith( "jelly:" ) == false && uri.startsWith( "dummy" ) == false && uri.equals( "" ) == false )
+ if ( prefix.equals( "" ) == false && uri.startsWith( "jelly:" ) == false && uri.startsWith( "dummy" ) == false && uri.equals( "" ) == false )
{
getPluginDynaTagDeps( getJellyScriptHousing() ).add( uri );
}
@@ -637,5 +641,6 @@
Goal goal = goalProject.getGoal( goalName );
return goal != null ? goal.getDescription() : "";
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org