mcconnell 2003/02/27 15:10:07
Modified: assembly/src/java/org/apache/avalon/assembly/engine/model
EngineConfigurationHelper.java
IncludeDescriptor.java LibraryDescriptor.java
Log:
Updated to include the specific notion of system verus application scope on
extension directory declarations.
Revision Changes Path
1.3 +3 -2
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/model/EngineConfigurationHelper.java
Index: EngineConfigurationHelper.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/model/EngineConfigurationHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EngineConfigurationHelper.java 11 Dec 2002 08:11:04 -0000 1.2
+++ EngineConfigurationHelper.java 27 Feb 2003 23:10:07 -0000 1.3
@@ -168,6 +168,7 @@
}
String base = config.getAttribute( "dir", "." );
+ String scope = config.getAttribute( "scope", "home" );
ArrayList list = new ArrayList();
Configuration[] configs = config.getChildren( "include" );
@@ -178,7 +179,7 @@
}
IncludeDescriptor[] dirs =
(IncludeDescriptor[])list.toArray( new IncludeDescriptor[ 0 ] );
- return new LibraryDescriptor( base, dirs );
+ return new LibraryDescriptor( scope, base, dirs );
}
}
1.2 +2 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/model/IncludeDescriptor.java
Index: IncludeDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/model/IncludeDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IncludeDescriptor.java 7 Dec 2002 09:34:28 -0000 1.1
+++ IncludeDescriptor.java 27 Feb 2003 23:10:07 -0000 1.2
@@ -75,6 +75,7 @@
*/
public class IncludeDescriptor implements Serializable
{
+
/**
* The base directory
*/
1.2 +37 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/model/LibraryDescriptor.java
Index: LibraryDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/engine/model/LibraryDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LibraryDescriptor.java 7 Dec 2002 09:34:28 -0000 1.1
+++ LibraryDescriptor.java 27 Feb 2003 23:10:07 -0000 1.2
@@ -74,6 +74,20 @@
*/
public class LibraryDescriptor extends FilesetDescriptor
{
+ /**
+ * Constant
+ */
+ public static final String HOME = "home";
+
+ /**
+ * Constant
+ */
+ public static final String SYSTEM = "system";
+
+ /**
+ * Flag holding the system scope status.
+ */
+ private boolean m_scope = false;
/**
* Create a LibraryDescriptor instance.
@@ -91,7 +105,29 @@
*/
public LibraryDescriptor( final String base, final IncludeDescriptor[] includes
)
{
+ this( HOME, base, includes );
+ }
+
+ /**
+ * Create a LibraryDescriptor instance.
+ *
+ * @param base the directory path against which include directives will be
evaluated
+ * @param includes the set of include directives
+ * @param scope the HOME or SYSTEM scope
+ */
+ public LibraryDescriptor( final String scope, final String base, final
IncludeDescriptor[] includes )
+ {
super( base, includes );
+ m_scope = SYSTEM.equalsIgnoreCase( scope );
+ }
+
+ /**
+ * Test if this library descriptor is relative to the system scope.
+ * @return TRUE if this is a system scoped descriptor else FALSE
+ */
+ public boolean isSystem()
+ {
+ return m_scope;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
