Author: mcconnell
Date: Sun Jul 4 09:29:48 2004
New Revision: 22576
Modified:
avalon/trunk/central/system/build/standard.xml
avalon/trunk/runtime/repository/util/src/java/org/apache/avalon/repository/util/LoaderUtils.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java
Log:
housekeeping
Modified: avalon/trunk/central/system/build/standard.xml
==============================================================================
--- avalon/trunk/central/system/build/standard.xml (original)
+++ avalon/trunk/central/system/build/standard.xml Sun Jul 4 09:29:48 2004
@@ -46,8 +46,6 @@
<target name="site" depends="javadoc,xdoc"/>
<target name="dist" depends="install,site"/>
-
- <target name="gump" depends="install"/>
</project>
Modified: avalon/trunk/runtime/repository/util/src/java/org/apache/avalon/repository/util/LoaderUtils.java
==============================================================================
--- avalon/trunk/runtime/repository/util/src/java/org/apache/avalon/repository/util/LoaderUtils.java (original)
+++ avalon/trunk/runtime/repository/util/src/java/org/apache/avalon/repository/util/LoaderUtils.java Sun Jul 4 09:29:48 2004
@@ -50,7 +50,7 @@
}
/**
- * Attempts to download and cache a remote artifact trying a set of remote
+ * Attempts to download and cache a remote artifact using a set of remote
* repositories. The operation is not fail fast and so it keeps trying if
* the first repository does not have the artifact in question.
*
@@ -64,7 +64,8 @@
public URL getResource( Artifact artifact,
String [] repositories, File root, boolean timestamping )
throws RepositoryException
- {
+ {
+
File destination = new File( root, artifact.getPath() );
if( !m_online )
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java Sun Jul 4 09:29:48 2004
@@ -410,103 +410,6 @@
}
}
- /*
- private void buildList( final File index, final boolean remote )
- {
- final Element root = ElementHelper.getRootElement( index );
- final Element[] elements = ElementHelper.getChildren( root );
- final File system = index.getParentFile();
- buildList( system, elements, remote );
- }
- */
-
- /*
- private void buildList(
- final File system, final Element[] children, final boolean remote )
- {
- if( null == children ) return;
-
- log( "entry: " + children.length, Project.MSG_VERBOSE );
- for( int i=0; i<children.length; i++ )
- {
- final Element element = children[i];
- final String tag = element.getTagName();
- if( isaResource( tag ) )
- {
- final Resource resource = createResource( element, system, remote );
- final String key = resource.getKey();
- m_resources.put( key, resource );
- log(
- "resource: " + resource
- + " key=" + key, Project.MSG_VERBOSE );
- }
- else if( "import".equals( element.getTagName() ) )
- {
- //
- // things get interesting
- //
-
- final String path = element.getAttribute( "href" );
- if(( null != path ) && ( !"".equals( path ) ))
- {
- if( !m_includes.contains( path ) )
- {
- File index = createTempFile();
- final URL url = createURL( path );
- final Get get = (Get) project.createTask( "get" );
- get.setSrc( url );
- get.setDest( index );
- get.setIgnoreErrors( false );
- get.setUseTimestamp( false );
- get.setVerbose( false );
- get.execute();
-
- m_includes.add( path );
-
- try
- {
- buildList( index, true );
- }
- catch( BuildException be )
- {
- final String error =
- "Model error occured while processing import."
- + "\n" + path;
- getProject().log( error );
- throw be;
- }
- }
- }
- else
- {
- final String filename = element.getAttribute( "index" );
- if(( null != filename ) && ( !"".equals( filename ) ))
- {
- final File index = Context.getFile( system, path );
- if( !m_includes.contains( index.toString() ) )
- {
- m_includes.add( index );
- buildList( index, true );
- }
- }
- else
- {
- final String error =
- "Invalid import - no href or index attribute.";
- throw new BuildException( error );
- }
- }
- }
- else
- {
- final String error =
- "Unrecognized element type \"" + tag + "\".";
- throw new BuildException( error );
- }
- }
- }
- */
-
private URL createURL( String path )
{
try
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.