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:12:02 UTC
cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder XMLContainerCreator.java XMLContainerUtil.java
mcconnell 2002/08/17 21:12:02
Modified: assembly/src/java/org/apache/excalibur/merlin/model
KernelDescriptor.java
assembly/src/java/org/apache/excalibur/merlin/model/builder
XMLContainerCreator.java XMLContainerUtil.java
Added: assembly/src/java/org/apache/excalibur/merlin/model
LibraryDescriptor.java
Removed: assembly/src/java/org/apache/excalibur/merlin/model
DirsetDescriptor.java ExtensionsDescriptor.java
Log:
Elimination of a potentially confilcting terminology concerning jar extensions
as opposed to lifestyle extensions (jar extensions are now packaged under
a <library> element> and correspond to the LibraryDescriptor class.
Revision Changes Path
1.9 +7 -9 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/KernelDescriptor.java
Index: KernelDescriptor.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/KernelDescriptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KernelDescriptor.java 2 Aug 2002 06:34:51 -0000 1.8
+++ KernelDescriptor.java 18 Aug 2002 04:12:02 -0000 1.9
@@ -11,7 +11,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;
/**
@@ -52,12 +52,10 @@
* Declaration of the extensions directories.
* --></i></font>
*
- * <extensions>
- * <dirset dir="<font color="darkred">.</font>">
- * <include name="<font color="darkred">extensions</font>"/>
- * <include name="<font color="darkred">lib</font>"/>
- * </dirset>
- * </extensions>
+ * <library dir="<font color="darkred">.</font>">
+ * <include name="<font color="darkred">extensions</font>"/>
+ * <include name="<font color="darkred">lib</font>"/>
+ * </ibrary>
*
* <font color="gray"><i><!--
* Common application classpath declaration.
@@ -97,7 +95,7 @@
* </pre>
*
* @see ClasspathDescriptor
- * @see ExtensionsDescriptor
+ * @see LibraryDescriptor
* @see LoggingDescriptor
* @see ContainerDescriptor
*
1.1 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/LibraryDescriptor.java
Index: LibraryDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.merlin.model;
import java.io.Serializable;
/**
* <p>An descriptor that declares a set of directories to be
* referenced as the installed extension directories. An extensions descriptor
* may contain multiple {@link IncludeDescriptor} instances.</p>
*
* <p><b>XML</b></p>
* <pre>
* <library dir="<font color="darkred">sys</font>">
* <include name="<font color="darkred">extensions</font>"/>
* <include name="<font color="darkred">lib</font>"/>
* </library>
* </pre>
*
* @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 04:12:02 $
*/
public class LibraryDescriptor extends FilesetDescriptor
{
/**
* Create a LibraryDescriptor instance.
*
* @param dirs the set of dirsets to include in the classpath
*/
public LibraryDescriptor( final String base, final IncludeDescriptor[] includes )
{
super( base, includes );
}
}
1.10 +9 -23 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerCreator.java
Index: XMLContainerCreator.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerCreator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLContainerCreator.java 12 Aug 2002 02:00:10 -0000 1.9
+++ XMLContainerCreator.java 18 Aug 2002 04:12:02 -0000 1.10
@@ -21,13 +21,12 @@
import org.apache.excalibur.merlin.model.ContainerDescriptor;
import org.apache.excalibur.merlin.model.IncludeDescriptor;
import org.apache.excalibur.merlin.model.FilesetDescriptor;
-import org.apache.excalibur.merlin.model.DirsetDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
import org.apache.excalibur.merlin.model.TargetDescriptor;
import org.apache.excalibur.merlin.model.TargetProvider;
import org.apache.excalibur.merlin.model.FileTargetProvider;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.ModelException;
import org.apache.excalibur.merlin.model.builder.XMLProfileCreator;
import org.apache.excalibur.merlin.model.ContextDirective;
@@ -243,33 +242,20 @@
return new FileTargetProvider( file );
}
- public ExtensionsDescriptor createExtensionsDescriptor( Configuration config )
+ public LibraryDescriptor createLibraryDescriptor( Configuration config )
throws ConfigurationException
{
+ String base = config.getAttribute("dir");
+
ArrayList list = new ArrayList();
- Configuration[] configs = config.getChildren("dirset");
+ Configuration[] configs = config.getChildren("include");
for( int i=0; i<configs.length; i++ )
{
Configuration c = configs[i];
- list.add( createDirsetDescriptor( c ) );
+ list.add( createIncludeDescriptor( c ) );
}
- DirsetDescriptor[] dirs = (DirsetDescriptor[]) list.toArray( new DirsetDescriptor[0] );
- return new ExtensionsDescriptor( dirs );
- }
-
- public DirsetDescriptor createDirsetDescriptor( Configuration config )
- throws ConfigurationException
- {
- String base = config.getAttribute("dir");
- ArrayList list = new ArrayList();
- Configuration[] includeConfigs = config.getChildren("include");
- for( int i=0; i<includeConfigs.length; i++ )
- {
- Configuration includeConfig = includeConfigs[i];
- list.add( createIncludeDescriptor( includeConfig ) );
- }
- IncludeDescriptor[] includes = (IncludeDescriptor[]) list.toArray( new IncludeDescriptor[0] );
- return new DirsetDescriptor( base, includes );
+ IncludeDescriptor[] dirs = (IncludeDescriptor[]) list.toArray( new IncludeDescriptor[0] );
+ return new LibraryDescriptor( base, dirs );
}
}
1.4 +9 -24 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerUtil.java
Index: XMLContainerUtil.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLContainerUtil.java 12 Aug 2002 02:00:11 -0000 1.3
+++ XMLContainerUtil.java 18 Aug 2002 04:12:02 -0000 1.4
@@ -18,13 +18,12 @@
import org.apache.excalibur.merlin.model.ContainerDescriptor;
import org.apache.excalibur.merlin.model.IncludeDescriptor;
import org.apache.excalibur.merlin.model.FilesetDescriptor;
-import org.apache.excalibur.merlin.model.DirsetDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.LoggingDescriptor;
import org.apache.excalibur.merlin.model.TargetDescriptor;
import org.apache.excalibur.merlin.model.TargetProvider;
import org.apache.excalibur.merlin.model.FileTargetProvider;
-import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
+import org.apache.excalibur.merlin.model.LibraryDescriptor;
import org.apache.excalibur.merlin.model.ModelException;
import org.apache.excalibur.merlin.model.builder.XMLProfileCreator;
@@ -126,33 +125,19 @@
return new FileTargetProvider( file );
}
- public ExtensionsDescriptor createExtensionsDescriptor( Configuration config )
+ public LibraryDescriptor createLibraryDescriptor( Configuration config )
throws ConfigurationException
{
+ String base = config.getAttribute("dir");
+
ArrayList list = new ArrayList();
- Configuration[] configs = config.getChildren("dirset");
+ Configuration[] configs = config.getChildren("include");
for( int i=0; i<configs.length; i++ )
{
Configuration c = configs[i];
- list.add( createDirsetDescriptor( c ) );
- }
- DirsetDescriptor[] dirs = (DirsetDescriptor[]) list.toArray( new DirsetDescriptor[0] );
- return new ExtensionsDescriptor( dirs );
- }
-
- public DirsetDescriptor createDirsetDescriptor( Configuration config )
- throws ConfigurationException
- {
- String base = config.getAttribute("dir");
- ArrayList list = new ArrayList();
- Configuration[] includeConfigs = config.getChildren("include");
- for( int i=0; i<includeConfigs.length; i++ )
- {
- Configuration includeConfig = includeConfigs[i];
- list.add( createIncludeDescriptor( includeConfig ) );
+ list.add( createIncludeDescriptor( c ) );
}
- IncludeDescriptor[] includes = (IncludeDescriptor[]) list.toArray( new IncludeDescriptor[0] );
- return new DirsetDescriptor( base, includes );
+ IncludeDescriptor[] dirs = (IncludeDescriptor[]) list.toArray( new IncludeDescriptor[0] );
+ return new LibraryDescriptor( base, dirs );
}
-
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>