You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2002/08/18 06:20:09 UTC
cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model Profile.java
mcconnell 2002/08/17 21:20:09
Modified: assembly/src/java/org/apache/excalibur/merlin
DefaultController.java Main.java
assembly/src/java/org/apache/excalibur/merlin/assembly
TypeManager.java
assembly/src/java/org/apache/excalibur/merlin/kernel
DefaultKernel.java
assembly/src/java/org/apache/excalibur/merlin/model
Profile.java
Log:
Synchronization of the Merlin core with updates to the meta-info and meta-data
models.
Revision Changes Path
1.16 +2 -2 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.java
Index: DefaultController.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultController.java 12 Aug 2002 02:00:08 -0000 1.15
+++ DefaultController.java 18 Aug 2002 04:20:09 -0000 1.16
@@ -35,7 +35,7 @@
import org.apache.excalibur.merlin.model.Resource;
import org.apache.excalibur.merlin.model.CategoriesDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
1.14 +2 -2 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Main.java 4 Aug 2002 06:43:19 -0000 1.13
+++ Main.java 18 Aug 2002 04:20:09 -0000 1.14
@@ -59,7 +59,7 @@
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.ContainerDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
import org.apache.excalibur.merlin.kernel.DefaultKernel;
import org.apache.excalibur.merlin.kernel.KernelException;
1.12 +19 -24 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java
Index: TypeManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TypeManager.java 16 Aug 2002 04:55:51 -0000 1.11
+++ TypeManager.java 18 Aug 2002 04:20:09 -0000 1.12
@@ -46,13 +46,11 @@
import org.apache.excalibur.meta.info.ReferenceDescriptor;
import org.apache.excalibur.meta.info.PhaseDescriptor;
import org.apache.excalibur.merlin.model.IncludeDescriptor;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
-import org.apache.excalibur.merlin.model.DirsetDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.FilesetDescriptor;
import org.apache.excalibur.merlin.model.IncludeDescriptor;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
-import org.apache.excalibur.merlin.model.DirsetDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
/**
* Abstract type manager.
@@ -71,7 +69,7 @@
ResourceManager.getPackageResources( TypeManager.class );
/**
- * Optional context key referencing an instance of {@link ExtensionsDescriptor}
+ * Optional context key referencing an instance of {@link LibraryDescriptor}
* that defines the set of extension directories to use.
*/
public static final String EXTENSIONS_DESCRIPTOR_KEY = "extensions";
@@ -106,7 +104,7 @@
/**
* Description of the extension directories.
*/
- private ExtensionsDescriptor m_extensions;
+ private LibraryDescriptor m_extensions;
/**
* Utility class to manage extension jar files.
@@ -170,7 +168,7 @@
{
try
{
- m_extensions = (ExtensionsDescriptor) context.get( EXTENSIONS_DESCRIPTOR_KEY );
+ m_extensions = (LibraryDescriptor) context.get( EXTENSIONS_DESCRIPTOR_KEY );
}
catch( ContextException e )
{
@@ -208,25 +206,22 @@
{
getLocalLogger().debug( "initializing extensions libraries" );
ArrayList list = new ArrayList();
+
File dir = new File( System.getProperty("user.dir") );
- DirsetDescriptor[] dirs = m_extensions.getDirsetDescriptors();
- for( int i=0; i<dirs.length; i++ )
+ File base = new File( dir, m_extensions.getBaseDirectory() );
+
+ IncludeDescriptor[] includes = m_extensions.getIncludeDescriptors();
+ for( int j=0; j<includes.length; j++ )
{
- DirsetDescriptor descriptor = dirs[i];
- File base = new File( dir, descriptor.getBaseDirectory() );
- IncludeDescriptor[] includes = descriptor.getIncludeDescriptors();
- for( int j=0; j<includes.length; j++ )
+ File include = new File( base, includes[j].getFile() );
+ if( include.isDirectory() )
+ {
+ list.add( include );
+ }
+ else
{
- File include = new File( base, includes[j].getFile() );
- if( include.isDirectory() )
- {
- list.add( include );
- }
- else
- {
- throw new IllegalArgumentException(
- "Include dir does not refer to a directory: " + include );
- }
+ throw new IllegalArgumentException(
+ "Include dir does not refer to a directory: " + include );
}
}
1.39 +5 -11 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- DefaultKernel.java 16 Aug 2002 03:09:24 -0000 1.38
+++ DefaultKernel.java 18 Aug 2002 04:20:09 -0000 1.39
@@ -70,8 +70,7 @@
import org.apache.excalibur.merlin.model.verifier.AssemblyVerifier;
import org.apache.excalibur.merlin.model.verifier.MetaDataVerifier;
import org.apache.excalibur.merlin.model.builder.XMLContainerUtil;
-import org.apache.excalibur.merlin.model.DirsetDescriptor;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.model.CategoriesDescriptor;
@@ -194,11 +193,6 @@
private CommandManager m_commandManager;
private PoolManager m_poolManager;
- /**
- * Internal reference to the thread within which the root container will execute.
- */
- private Thread m_thread;
-
private boolean m_initialized = false;
private boolean m_started = false;
private boolean m_stopped = false;
@@ -356,7 +350,7 @@
// Independently of any declare lifestyle manager, make sure
// the default lifestyle manager is declared at the kernel
// level. Customized managers may appear at the root container
- // level and override the derault. If not custom mananager is
+ // level and override the derault. If no custom mananager is
// defined, then system defaults will apply
//
@@ -376,8 +370,8 @@
// the extension directives and classpath descriptor.
//
- ExtensionsDescriptor extensions =
- m_creator.createExtensionsDescriptor( m_config.getChild("extensions") );
+ LibraryDescriptor extensions =
+ m_creator.createLibraryDescriptor( m_config.getChild("library") );
ClasspathDescriptor classpath =
m_creator.createClasspathDescriptor( m_config.getChild("classpath") );
1.22 +2 -2 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java
Index: Profile.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Profile.java 14 Aug 2002 03:03:35 -0000 1.21
+++ Profile.java 18 Aug 2002 04:20:09 -0000 1.22
@@ -404,7 +404,7 @@
if( m_config != null )
return m_config;
- final Configuration defaults = getType().getDefaultConfiguration( classloader );
+ final Configuration defaults = getType().getConfiguration( classloader );
Configuration base = null;
if( getConfiguration().getAttribute("src", null ) != null )
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>