The attached patch contains an update to tools/index.xml (some gump alias names are added for the checkstyle spell fixing the latest gump failure notification). The diff also includes the earlier changes to Magic's path datatype and the replicator task.
Steve.
Index: tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java =================================================================== --- tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java (revision 46290) +++ tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java (working copy) @@ -21,6 +21,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Path; /** @@ -114,6 +115,11 @@ // private //------------------------------------------------------------ + public Object clone() + { + setup(); + return super.clone(); + } public String[] list() { @@ -121,6 +127,18 @@ return super.list(); } + public int size() + { + setup(); + return super.size(); + } + + public String toString() + { + setup(); + return super.toString(); + } + private int getMode() { return m_mode; Index: tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java =================================================================== --- tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java (revision 46290) +++ tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java (working copy) @@ -70,14 +70,6 @@ /** * The id of a repository based path. */ - public void setRefid( Path path ) - { - m_path = path; - } - - /** - * The id of a repository based path. - */ public void setRefid( String id ) throws BuildException { @@ -130,6 +122,8 @@ private FileSet createFileSet( final File cache, final Path path ) { + getProject().log( "using replication path: " + m_path, Project.MSG_VERBOSE ); + String root = cache.toString(); String sequence = path.toString(); String[] translation = Path.translatePath( getProject(), sequence ); Index: tools/index.xml =================================================================== --- tools/index.xml (revision 46290) +++ tools/index.xml (working copy) @@ -79,6 +79,9 @@ <version>5.1</version> <type>jar</type> </info> + <gump> + <alias>jakarta-bcel</alias> + </gump> </resource> <resource> @@ -115,6 +118,9 @@ <version>1.3</version> <type>jar</type> </info> + <gump> + <alias>jakarta-regexp</alias> + </gump> </resource> <resource> Index: central/system/gump/avalon-trunk.xml =================================================================== --- central/system/gump/avalon-trunk.xml (revision 46290) +++ central/system/gump/avalon-trunk.xml (working copy) @@ -3037,7 +3037,7 @@ <depend property="gump.resource.antlr" project="antlr"> <noclasspath/> </depend> - <depend property="gump.resource.bcel" project="bcel"> + <depend property="gump.resource.bcel" project="jakarta-bcel"> <noclasspath/> </depend> <depend property="gump.resource.commons-beanutils-core" project="commons-beanutils-core"> @@ -3049,7 +3049,7 @@ <depend property="gump.resource.commons-logging" project="commons-logging" id="commons-logging"> <noclasspath/> </depend> - <depend property="gump.resource.regexp" project="regexp"> + <depend property="gump.resource.regexp" project="jakarta-regexp"> <noclasspath/> </depend> <!-- end for -->
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]