dion 2004/01/02 22:02:15
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
Code cleanup
Revision Changes Path
No revision
No revision
1.70.4.9 +14 -10 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.8
retrieving revision 1.70.4.9
diff -u -r1.70.4.8 -r1.70.4.9
--- PluginManager.java 2 Jan 2004 23:30:58 -0000 1.70.4.8
+++ PluginManager.java 3 Jan 2004 06:02:15 -0000 1.70.4.9
@@ -312,7 +312,7 @@
}
catch (Exception e)
{
- log.info("Error loading plugin from directory '"
+ log.info("Error loading plugin from directory '"
+ plugin.getDirectory() + "'", e);
}
}
@@ -335,10 +335,9 @@
/**
* @param plugin the plugin to create a housing for
* @return a housing
- * @throws MalformedURLException
- * @throws Exception
+ * @throws Exception if there are problems getting the compiled script for a
plugin
*/
- private JellyScriptHousing createJellyScriptHousing(JellyPlugin plugin) throws
MalformedURLException, Exception
+ private JellyScriptHousing createJellyScriptHousing(JellyPlugin plugin) throws
Exception
{
JellyScriptHousing jellyScriptHousing = new JellyScriptHousing();
jellyScriptHousing.setId( plugin.getId() );
@@ -358,9 +357,12 @@
* @param unpackedPluginDirectory
* @param jelly
* @return
- * @throws Exception
+ * @throws MalformedURLException if an error occurs converting the unpacked
plugin directory
+ * to a URL, or if [EMAIL PROTECTED]
#processDependencies(Project,ForeheadClassLoader)} does
+ * @throws Exception when jelly compilation fails
*/
- private JellyScriptHousing createJellyScriptHousing( Project project, File
unpackedPluginDirectory, InputStream jelly ) throws Exception
+ private JellyScriptHousing createJellyScriptHousing(Project project, File
unpackedPluginDirectory, InputStream jelly )
+ throws MalformedURLException, Exception
{
JellyScriptHousing jellyScriptHousing = new JellyScriptHousing();
@@ -530,7 +532,7 @@
// Set up the ant project.
AntProjectBuilder.build( project, baseContext );
-// TODO [RC2] - I think this needs to be reverted afterwards (antTagLibrary)
+ // TODO [RC2] - I think this needs to be reverted afterwards (antTagLibrary)
Session session = getJellySession(baseContext);
// add the global session to the pluginContext so that it can be used by
tags
@@ -613,6 +615,7 @@
// Now at this point we should be able to use the name of a goal to
lookup all
// the plugins (that are stored in the plugin housings) that need to be
executed
// in order to satisfy all the required preconditions for successful
goal attainment.
+ // TODO [RC2] change the name of this variable, as it hides the
instance map
Set plugins = transientMapper.resolveJellyScriptHousings( goalName );
@@ -801,10 +804,10 @@
}
}
- public Project getPluginProject( String id ) throws UnknownPluginException
+ public Project getPluginProject( String id ) throws UnknownPluginException
{
JellyPlugin plugin = (JellyPlugin) plugins.get( id );
- if ( plugin == null )
+ if ( plugin == null )
{
throw new UnknownPluginException( id );
}
@@ -812,6 +815,7 @@
}
/**
+ * FIXME This method is never called
* @todo [RC2] - move to utils?
* @param ctx1
* @param ctx2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
