mcconnell 2003/08/12 03:51:09
Modified: merlin/merlin-plugin plugin.jelly
merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
Log:
Fix (a) incorrect kernel.xml reference, and (b) out-of-date constructor reference
(Vinay).
Revision Changes Path
1.19 +2 -1 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 11 Aug 2003 22:58:52 -0000 1.18
+++ plugin.jelly 12 Aug 2003 10:51:09 -0000 1.19
@@ -44,7 +44,8 @@
If a kernel configuration has been declared the use it otherwise
we default to the merlin installation kernel definition.
-->
- <j:set var="merlin.kernel" value="${env.MERLIN_HOME}/config/kernel.xml"/>
+ <j:set var="merlin.kernel"
+ value="${env.MERLIN_HOME}/repository/merlin/xmls/kernel-3.0.xml"/>
<j:set var="merlin.kernel.config" value="${merlin.kernel}"/>
<util:file var="kernelFile" name="${merlin.kernel.config}"/>
<j:if test="${kernelFile.exists()}">
1.9 +1 -46
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MerlinBean.java 11 Aug 2003 22:58:52 -0000 1.8
+++ MerlinBean.java 12 Aug 2003 10:51:09 -0000 1.9
@@ -295,51 +295,6 @@
public void doExecute() throws Exception
{
- /*
- if( m_debug.equalsIgnoreCase( "debug" ) )
- {
- final String system =
- "System '" + m_system + "'";
- System.out.println( system );
-
- final String kernelConfig =
- "Kernel '" + m_kernelPath + "'";
- System.out.println( kernelConfig );
-
- final String conf =
- "Config '" + m_conf + "' (" + m_conf.exists() + ")";
- System.out.println( conf );
-
- if( m_target != null )
- {
- if( m_path != null )
- {
- final String error =
- "Incompatible arguments - use target or path.";
- throw new IllegalArgumentException( error );
- }
-
- final String target =
- "Target '" + m_target + "'";
- System.out.println( target );
- }
- else
- {
- final String path =
- "Path '" + m_path + "'";
- System.out.println( path );
-
- final String base =
- "Base '" + m_base + "'";
- System.out.println( base );
- }
-
- final String debug =
- "Debug '" + m_debug + "'";
- System.out.println( debug );
- System.out.println( "" );
- }
- */
try
{
Repository repository = new DefaultFileRepository( m_repository );
@@ -347,7 +302,7 @@
new DefaultKernelContext(
repository, m_system, m_home, m_kernelPath.toURL(),
new URL[]{ getTarget() },
- getConfigurationURL(), getDebugFlag() );
+ getConfigurationURL(), m_deploy, getDebugFlag() );
m_kernel = new DefaultKernel( context );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
