You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/05/21 15:29:18 UTC
svn commit: rev 20197 - in avalon/trunk/tools/magic: engine/src/java/org/apache/merlin/magic jar/src/dist
Author: niclas
Date: Fri May 21 06:29:17 2004
New Revision: 20197
Modified:
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/AbstractPlugin.java
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginObserver.java
avalon/trunk/tools/magic/jar/src/dist/build.bsh
Log:
Touching up...
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/AbstractPlugin.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/AbstractPlugin.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/AbstractPlugin.java Fri May 21 06:29:17 2004
@@ -61,13 +61,13 @@
}
}
- protected void notifyStep( String method, int stepIndex )
+ protected void notifyStep( String method, String step )
{
Iterator list = m_Listeners.iterator();
while( list.hasNext() )
{
PluginObserver observer = (PluginObserver) list.next();
- observer.stepPerformed( this, method, stepIndex );
+ observer.stepPerformed( this, method, step );
}
}
}
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginObserver.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginObserver.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginObserver.java Fri May 21 06:29:17 2004
@@ -6,5 +6,5 @@
void postMethod( Plugin source, String method );
- void stepPerformed( Plugin source, String method, int stepIndex );
+ void stepPerformed( Plugin source, String method, String step );
}
Modified: avalon/trunk/tools/magic/jar/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/jar/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/jar/src/dist/build.bsh Fri May 21 06:29:17 2004
@@ -7,10 +7,9 @@
import org.apache.merlin.magic.Plugin;
import org.apache.merlin.magic.PluginContext;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
@@ -18,49 +17,34 @@
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.taskdefs.Javac;
-public class JarPlugin extends AbstractLogEnabled
- implements Plugin, Contextualizable
+public class JarPlugin extends AbstractPlugin
+ implements Serviceable
{
- private PluginContext m_PluginContext;
-
- private Project m_Project;
-
- private ArrayList m_JarListeners;
-
+ private Object m_JavaPlugin;
private boolean m_Jarred = false;
- public void contextualize( Context ctx )
+ public void service( ServiceManager man )
+ throws ServiceException
{
- m_PluginContext = (PluginContext) ctx;
- m_Project = m_PluginContext.getAntProject();
+ m_JavaPlugin = man.lookup( "java" );
}
public void jar()
{
if( m_Jarred )
return;
- notifyPreJar();
- executeJar();
- notifyPostJar();
+
+ JavaPlugin java = (JavaPlugin) m_JavaPlugin;
+ java.compile();
+
+ notifyPreMethod( "jar" );
+ prepareManifest()
+ notifyStep( "jar", "manifest-created" );
+ createJar();
+ notifyPostMethod( "jar" );
m_Jarred = true;
}
- public void addJarListener( JarListener listener )
- {
- if( m_JarListeners == null )
- {
- m_JarListeners = new ArrayList();
- }
- m_JarListeners.add( listener );
- }
-
- public void removeJarListener( JarListener listener )
- {
- if( m_JarListeners == null )
- return;
- m_JarListeners.remove( listener );
- }
-
private File prepareManifest()
{
String manifestName = m_PluginContext.getProperty( "jar.manifest" );
@@ -80,7 +64,7 @@
return manifest;
}
- private void executeJar( File manifest )
+ private void createJar( File manifest )
{
String jarFilename = m_PluginContext.getProperty( "jar.filename" );
File jarFile = new File( jarFilename );
@@ -109,38 +93,5 @@
javac.init();
javac.execute();
- }
-
- private void notifyPreJar()
- {
- if( m_JarListeners == null )
- return;
- Iterator list = m_JarListeners.iterator();
- while( list.hasNext() )
- {
- JarListener listener = (JarListener) list.next();
- listener.preCompile();
- }
- }
-
- private void notifyPostJar()
- {
- if( m_JarListeners == null )
- return;
- Iterator list = m_JarListeners.iterator();
- while( list.hasNext() )
- {
- JarListener listener = (JarListener) list.next();
- listener.postCompile();
- }
- }
-
- public interface JarListener
- {
- void preJar();
-
- void manifestPrepared();
-
- void postJar();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org