Author: mcconnell
Date: Fri Jun 11 13:17:03 2004
New Revision: 21110
Removed:
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/playground/
Modified:
avalon/trunk/central/system/index.xml
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/HomeTask.java
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
housekeeping
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Fri Jun 11 13:17:03 2004
@@ -754,6 +754,18 @@
</dependencies>
</project>
+ <project basedir="../../runtime/merlin/unit">
+ <info>
+ <group>avalon/merlin</group>
+ <name>avalon-merlin-unit</name>
+ <version>3.3.0</version>
+ </info>
+ <dependencies>
+ <include key="avalon-repository-main"/>
+ <include key="avalon-merlin-impl" build="false" test="false" runtime="false"/>
+ </dependencies>
+ </project>
+
</projects>
</system>
Modified:
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/HomeTask.java
==============================================================================
--- avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/HomeTask.java
(original)
+++ avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/HomeTask.java
Fri Jun 11 13:17:03 2004
@@ -40,9 +40,12 @@
*/
public class HomeTask extends ContextualTask
{
- private String m_id;
+ private static final String CACHE_DIR_KEY = "project.home.cache.dir";
+
private static Home HOME;
+ private String m_id;
+
/**
* Set the home ref id to the system home. If not supplied the
* default system home 'project.home' id will apply.
@@ -64,6 +67,9 @@
HOME = new Home( getProject(), Home.KEY );
}
getProject().addReference( Home.KEY, HOME );
+ getProject().setNewProperty(
+ CACHE_DIR_KEY,
+ HOME.getRepository().getCacheDirectory().toString() );
}
}
Modified:
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
---
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
(original)
+++
avalon/trunk/tools/project/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Fri Jun 11 13:17:03 2004
@@ -109,11 +109,9 @@
{
File classes = new File( m_test, "classes" );
mkDir( classes );
+
Definition definition = getHome().getDefinition( getKey() );
Path classpath = definition.getPath( project, Policy.TEST );
-
- //Path classpath =
- // getHome().getRepository().createPath( project, definition,
Policy.TEST );
//
// add the project jar to the classpath for the compilation
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
