mcconnell 2003/02/08 00:52:11
Modified: assembly/src/java/org/apache/avalon/assembly/appliance
ApplianceContext.java DefaultAppliance.java
DefaultApplianceFactory.java
assembly/src/java/org/apache/avalon/assembly/engine
EngineClassLoader.java
Log:
Correeected a bug that cause non-propergation of the assembly:home directory.
Revision Changes Path
1.12 +1 -2
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java
Index: ApplianceContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApplianceContext.java 7 Feb 2003 15:38:57 -0000 1.11
+++ ApplianceContext.java 8 Feb 2003 08:52:11 -0000 1.12
@@ -242,5 +242,4 @@
*/
boolean getStartupPolicy();
-
}
1.32 +2 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DefaultAppliance.java 7 Feb 2003 15:38:57 -0000 1.31
+++ DefaultAppliance.java 8 Feb 2003 08:52:11 -0000 1.32
@@ -635,6 +635,7 @@
//
File base = (File) m_system.get( "urn:assembly:home" );
+
File working = new File( base, "working" );
File home = new File( working, "home" );
File work = new File( working, "temp" );
1.9 +2 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceFactory.java
Index: DefaultApplianceFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultApplianceFactory.java 7 Feb 2003 15:38:57 -0000 1.8
+++ DefaultApplianceFactory.java 8 Feb 2003 08:52:11 -0000 1.9
@@ -248,6 +248,7 @@
try
{
PoolManager pool = (PoolManager) system.get(
"urn:assembly:threads.manager" );
+
DefaultLocator locator = new DefaultLocator( context );
locator.put( "urn:assembly:engine", engine );
locator.put( "urn:assembly:lifestyle.service",
createLifestyleService( engine, pool ) );
1.33 +2 -24
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/EngineClassLoader.java
Index: EngineClassLoader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/EngineClassLoader.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- EngineClassLoader.java 7 Feb 2003 15:38:59 -0000 1.32
+++ EngineClassLoader.java 8 Feb 2003 08:52:11 -0000 1.33
@@ -1067,27 +1067,6 @@
return manager;
}
- /*
- private ApplianceRepository createApplianceRepository( Map facilities )
- throws Exception
- {
- if( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "creating appliance manager" );
- }
-
- DefaultApplianceRepository manager = new
DefaultApplianceRepository();
- manager.enableLogging( getLogger() );
- manager.contextualize( new DefaultContext() ); // <-- placeholder
for parent manager
- DefaultServiceManager services = new DefaultServiceManager();
- services.put( "urn:assembly:engine.classloader", this );
- services.makeReadOnly();
- manager.service( services );
- manager.initialize();
- return manager;
- }
- */
-
private Locator getSystemContext()
{
if( m_system != null )
@@ -1116,8 +1095,7 @@
}
catch( ContextException ce )
{
- final File home = new File( System.getProperty( "user.dir" ) );
- context.put( "urn:assembly:home", home );
+ context.put( "urn:assembly:home", m_home );
}
try
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
