mcconnell 2002/12/19 02:37:27
Modified: assembly/src/java/org/apache/avalon/assembly/engine
EngineClassLoader.java Engine.java
Log:
Updated to handle changed location for the assembly services plus switching from
"urn:avalon:home" to "urn:assembly:home" for the real base directory.
Revision Changes Path
1.12 +8 -7
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EngineClassLoader.java 17 Dec 2002 09:55:24 -0000 1.11
+++ EngineClassLoader.java 19 Dec 2002 10:37:26 -0000 1.12
@@ -74,6 +74,9 @@
import org.apache.avalon.assembly.appliance.DefaultApplianceManager;
import org.apache.avalon.assembly.appliance.DependencyGraph;
import org.apache.avalon.assembly.appliance.MappedServiceManager;
+import org.apache.avalon.assembly.lifecycle.AssemblyService;
+import org.apache.avalon.assembly.lifecycle.DefaultAssemblyService;
+import org.apache.avalon.assembly.lifecycle.AssemblyException;
import org.apache.avalon.assembly.lifecycle.DeploymentService;
import org.apache.avalon.assembly.lifecycle.DefaultDeploymentService;
import org.apache.avalon.assembly.lifestyle.LifestyleException;
@@ -365,7 +368,7 @@
try
{
- m_home = (File)context.get( "urn:avalon:home" );
+ m_home = (File)context.get( "urn:assembly:home" );
}
catch( ContextException e )
{
@@ -829,9 +832,7 @@
}
catch( Throwable e )
{
- final String error =
- "Failed to register one or more profiles.";
- throw new EngineRuntimeException( error, e );
+ // type is already registered
}
}
@@ -1190,12 +1191,12 @@
try
{
- context.get( "urn:avalon:home" );
+ context.get( "urn:assembly:home" );
}
catch( ContextException ce )
{
final File home = new File( System.getProperty( "user.dir" ) );
- context.put( "urn:avalon:home", home );
+ context.put( "urn:assembly:home", home );
}
try
1.9 +2 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/Engine.java
Index: Engine.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/Engine.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Engine.java 17 Dec 2002 04:55:01 -0000 1.8
+++ Engine.java 19 Dec 2002 10:37:26 -0000 1.9
@@ -61,6 +61,7 @@
import org.apache.avalon.assembly.appliance.ApplianceException;
import org.apache.avalon.assembly.appliance.ApplianceContext;
import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
+import org.apache.avalon.assembly.lifecycle.AssemblyService;
import org.apache.avalon.assembly.lifestyle.LifestyleService;
import org.apache.avalon.assembly.lifestyle.LifestyleHandler;
import org.apache.avalon.meta.info.DependencyDescriptor;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
