mcconnell 2003/06/08 18:10:17
Modified: merlin/merlin-plugin plugin.jelly
merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
Log:
Addition of goal supporting the replication of a jar from the local Maven repository
to the local Merlin repository and enhanced the execution mode support for running a
component inside Maven..
Revision Changes Path
1.7 +16 -0 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 14 May 2003 09:36:09 -0000 1.6
+++ plugin.jelly 9 Jun 2003 01:10:17 -0000 1.7
@@ -181,4 +181,20 @@
</goal>
+ <goal name="merlin:install" prereqs="jar:install"
+ description="Install the jar file into the Merlin repository.">
+ <attainGoal name="merlin:replicate"/>
+ </goal>
+
+ <goal name="merlin:replicate">
+ <property environment="env"/>
+ <echo>replicate</echo>
+ <echo> source:
${maven.repo.local}/${pom.artifactDirectory}/jars/${maven.final.name}.jar</echo>
+ <echo> target:
${env.MERLIN_HOME}/repository/${pom.artifactDirectory}/jars/</echo>
+
+ <mkdir dir="${env.MERLIN_HOME}/repository/${pom.artifactDirectory}/jars"/>
+ <copy
file="${maven.repo.local}/${pom.artifactDirectory}/jars/${maven.final.name}.jar"
+ toDir="${env.MERLIN_HOME}/repository/${pom.artifactDirectory}/jars"/>
+ </goal>
+
</project>
1.5 +2 -5
avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
Index: MerlinBean.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MerlinBean.java 9 May 2003 05:42:38 -0000 1.4
+++ MerlinBean.java 9 Jun 2003 01:10:17 -0000 1.5
@@ -266,6 +266,7 @@
map.put( "urn:merlin:system", m_system );
map.put( "urn:merlin:kernel.profile", m_kernelPath );
map.put( "urn:merlin:debug", m_debug );
+ map.put( "urn:merlin:kernel.server", "false" );
if( m_target != null )
{
map.put( "urn:merlin:block.url", getTarget() );
@@ -280,7 +281,7 @@
map.put( "urn:merlin:block.config", m_conf.toURL() );
}
- m_kernel = loader.build( map );
+ loader.build( map );
}
catch( Throwable e )
{
@@ -290,10 +291,6 @@
System.err.println( message );
throw new KernelException( message, e );
}
-
- Thread.currentThread().sleep( m_wait );
-
- m_kernel.shutdown();
}
private static URL[] getJarFiles( File base )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
