Author: mcconnell
Date: Thu Jun 3 23:15:13 2004
New Revision: 20814
Modified:
avalon/trunk/tools/project/core/src/main/org/apache/avalon/tools/home/Home.java
avalon/trunk/tools/project/core/src/test/projects/sample/build.xml
Log:
Housekeeping.
Modified:
avalon/trunk/tools/project/core/src/main/org/apache/avalon/tools/home/Home.java
==============================================================================
---
avalon/trunk/tools/project/core/src/main/org/apache/avalon/tools/home/Home.java
(original)
+++
avalon/trunk/tools/project/core/src/main/org/apache/avalon/tools/home/Home.java
Thu Jun 3 23:15:13 2004
@@ -81,7 +81,6 @@
private String m_id;
private String m_key;
- private Project m_project;
private Repository m_repository;
private File m_system;
private File m_file;
@@ -91,16 +90,6 @@
private BuildListener m_listener;
//-------------------------------------------------------------
- // constructor
- //-------------------------------------------------------------
-
- public Home( Project project )
- {
- super();
- m_project = project;
- }
-
- //-------------------------------------------------------------
// setters
//-------------------------------------------------------------
@@ -183,8 +172,7 @@
}
m_system = m_file.getParentFile();
- m_project.log( "home: " + m_system, Project.MSG_DEBUG );
-
+ log( "home: " + m_system, Project.MSG_DEBUG );
Element root = ElementHelper.getRootElement( m_file );
final Element repo = ElementHelper.getChild( root, "repository" );
@@ -311,7 +299,7 @@
public void build( Definition definition )
{
- Ant ant = (Ant) m_project.createTask( "ant" );
+ Ant ant = (Ant) getProject().createTask( "ant" );
Property property = ant.createProperty();
property.setName( "urn:avalon.definition.key" );
property.setValue( definition.getKey() );
@@ -369,14 +357,14 @@
if( null == resources ) return;
Element[] resourceArray = ElementHelper.getChildren( resources,
"resource" );
- m_project.log( "resources: " + resourceArray.length, Project.MSG_DEBUG
);
+ log( "resources: " + resourceArray.length, Project.MSG_DEBUG );
for( int i=0; i<resourceArray.length; i++ )
{
Element child = resourceArray[i];
Resource resource = XMLDefinitionBuilder.createResource( this,
child );
String key = resource.getKey();
m_resources.put( key, resource );
- m_project.log(
+ log(
"resource: " + resource + " key=" + key,
Project.MSG_DEBUG );
}
@@ -387,7 +375,7 @@
if( null == projects ) return;
Element[] entries = ElementHelper.getChildren( projects );
- m_project.log(
+ log(
"projects: " + entries.length,
Project.MSG_DEBUG );
for( int i=0; i<entries.length; i++ )
@@ -397,7 +385,7 @@
XMLDefinitionBuilder.createDefinition( this, element, m_system );
String key = definition.getKey();
m_resources.put( key, definition );
- m_project.log(
+ log(
"project: " + definition + " key=" + key,
Project.MSG_DEBUG );
}
@@ -406,12 +394,12 @@
private Repository createRepository( Element repo )
{
Repository repository = new Repository( this, repo );
- m_project.log( "cache: " + repository.getCacheDirectory(),
Project.MSG_DEBUG );
+ log( "cache: " + repository.getCacheDirectory(), Project.MSG_DEBUG );
String[] hosts = repository.getHosts();
- m_project.log( "Hosts: " + hosts.length, Project.MSG_DEBUG );
+ log( "Hosts: " + hosts.length, Project.MSG_DEBUG );
for( int i=0; i<hosts.length; i++ )
{
- m_project.log( " host: " + hosts[i], Project.MSG_DEBUG );
+ log( " host: " + hosts[i], Project.MSG_DEBUG );
}
return repository;
}
Modified: avalon/trunk/tools/project/core/src/test/projects/sample/build.xml
==============================================================================
--- avalon/trunk/tools/project/core/src/test/projects/sample/build.xml
(original)
+++ avalon/trunk/tools/project/core/src/test/projects/sample/build.xml Thu Jun
3 23:15:13 2004
@@ -4,6 +4,7 @@
xmlns:x="antlib:org.apache.avalon.tools"
xmlns:d="plugin:demo/demo#1.0" >
+ <property file="build.properties"/>
<import file="${project.home}/standard.xml"/>
<x:home>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
