brett 2003/12/30 18:14:48
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
PR: MAVEN-1075
echo goal names
Revision Changes Path
No revision
No revision
1.70.4.7 +3 -27 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.6
retrieving revision 1.70.4.7
diff -u -r1.70.4.6 -r1.70.4.7
--- PluginManager.java 10 Dec 2003 23:08:44 -0000 1.70.4.6
+++ PluginManager.java 31 Dec 2003 02:14:48 -0000 1.70.4.7
@@ -484,10 +484,6 @@
/** */
public static final String BASE_CONTEXT = "maven.goalAttainmentContext";
/** */
- public static String JELLY_CONTEXT = "mavenGoalTag.jellyContext";
- /** */
- public static String XML_OUTPUT = "mavenGoalTag.xmlOutput";
- /** */
public static final String PLUGIN_MANAGER = "maven.pluginManager";
/**
@@ -499,8 +495,7 @@
private Session getJellySession(MavenJellyContext baseContext) throws Exception
{
// Create the Jelly session
- Session session = new JellySession( getJellyOutputSink() );
- session.setAttribute( XML_OUTPUT, getJellyOutputSink() );
+ Session session = new JellySession( baseContext.getXMLOutput() );
session.setAttribute( PLUGIN_MANAGER, this );
session.setAttribute( BASE_CONTEXT, baseContext );
return session;
@@ -677,27 +672,8 @@
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( context.getClassLoader() );
- s.run(context, getJellyOutputSink());
+ s.run(context, context.getXMLOutput());
Thread.currentThread().setContextClassLoader( loader );
- }
-
- /** XML output goes to System.out*/
- private XMLOutput output;
-
- /** TODO [RC2]: the different output sink is a problem */
- private XMLOutput getJellyOutputSink()
- throws Exception
- {
- if ( output == null )
- {
- PrintStream consoleOut = System.out;
- //PrintStream consoleErr = System.err;
-
- Writer writer = new OutputStreamWriter( consoleOut );
- output = XMLOutput.createXMLOutput( writer, false );
- }
-
- return output;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
