Author: niclas
Date: Sat Sep 18 01:01:26 2004
New Revision: 46295
Modified:
avalon/trunk/tools/index.xml
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java
Log:
Patch from Stephen solving an 'excessive replication' problem.
Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml (original)
+++ avalon/trunk/tools/index.xml Sat Sep 18 01:01:26 2004
@@ -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>
Modified:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java
(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/MagicPath.java
Sat Sep 18 01:01:26 2004
@@ -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,11 +115,28 @@
// private
//------------------------------------------------------------
+ public Object clone()
+ {
+ setup();
+ return super.clone();
+ }
public String[] list()
{
setup();
return super.list();
+ }
+
+ public int size()
+ {
+ setup();
+ return super.size();
+ }
+
+ public String toString()
+ {
+ setup();
+ return super.toString();
}
private int getMode()
Modified:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java
(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java
Sat Sep 18 01:01:26 2004
@@ -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 );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
