mcconnell 2003/08/19 02:59:51
Modified: merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernelContext.java
merlin/merlin-platform/src/config wrapper.conf
Log:
Update kernel configuration handling.
Revision Changes Path
1.13 +11 -4
avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultKernelContext.java 19 Aug 2003 08:32:32 -0000 1.12
+++ DefaultKernelContext.java 19 Aug 2003 09:59:51 -0000 1.13
@@ -78,7 +78,6 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.merlin.kernel.KernelContext;
import org.apache.avalon.merlin.kernel.KernelException;
-import org.apache.avalon.meta.ConfigurationBuilder;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.ProxyContext;
import org.apache.avalon.repository.impl.DefaultAuthenticator;
@@ -137,6 +136,11 @@
private final File m_home;
/**
+ * The working directory
+ */
+ private final File m_working;
+
+ /**
* The temp path
*/
private final File m_temp;
@@ -231,6 +235,7 @@
m_home = new File( System.getProperty( "user.work" ));
}
+ m_working = new File( home, "home" );
m_temp = new File( System.getProperty( "java.io.tmpdir" ) );
if( kernel != null )
@@ -257,7 +262,9 @@
getResourceAsStream( "kernel.xml" );
final InputSource source =
new InputSource( stream );
- kernelConfig = ConfigurationBuilder.build( source );
+ DefaultConfigurationBuilder builder =
+ new DefaultConfigurationBuilder();
+ kernelConfig = builder.build( source );
}
catch( Throwable ee )
{
@@ -503,7 +510,7 @@
*/
public File getHomePath()
{
- return m_home;
+ return m_working;
}
/**
1.5 +8 -9 avalon-sandbox/merlin/merlin-platform/src/config/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/wrapper.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wrapper.conf 17 Aug 2003 00:51:57 -0000 1.4
+++ wrapper.conf 19 Aug 2003 09:59:51 -0000 1.5
@@ -26,15 +26,14 @@
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=Merlin
-wrapper.app.parameter.2=-server
-wrapper.app.parameter.3=-system
-wrapper.app.parameter.4=./..
-wrapper.app.parameter.3=-kernel
-wrapper.app.parameter.4=./../config/kernel.xml
-wrapper.app.parameter.5=-home
-wrapper.app.parameter.6=./..
-wrapper.app.parameter.7=-config
-wrapper.app.parameter.8=./../config/config.xml
+wrapper.app.parameter.2=-system
+wrapper.app.parameter.3=./..
+wrapper.app.parameter.4=-kernel
+wrapper.app.parameter.5=./../config/kernel.xml
+wrapper.app.parameter.6=-home
+wrapper.app.parameter.7=./..
+wrapper.app.parameter.8=-config
+wrapper.app.parameter.9=./../config/config.xml
# Port which the native wrapper code will attempt to connect to
wrapper.port=1777
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
