mcconnell 2003/12/14 01:56:08
Modified: merlin/kernel/unit maven.xml project.xml
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
Log:
Refactory to use the DefaultBuilder as the basis for implementation artifact
resolution.
Revision Changes Path
1.7 +7 -22 avalon/merlin/kernel/unit/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 13 Dec 2003 21:07:01 -0000 1.6
+++ maven.xml 14 Dec 2003 09:56:08 -0000 1.7
@@ -2,32 +2,17 @@
<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<!--
- ###################################################################
- # Create the merlin.implementation property file. #
- # This contains the information used to identify the #
- # the implementation artifact. #
- ###################################################################
+ Add the merlin.properties file.
-->
- <!--
<postGoal name="java:compile">
- <ant:echo file="${maven.build.dir}/classes/merlin.implementation">
-#===================================================================#
-# Default merlin implementation artifact identifier. #
-#===================================================================#
-
-meta.domain = avalon
-meta.version = 1.0
-avalon.artifact.group = ${merlin.implementation.group}
-avalon.artifact.name = ${merlin.implementation.name}
-avalon.artifact.version = ${merlin.implementation.version}
-
-#
-# EOF
-#
-</ant:echo>
+ <ant:copy
file="${maven.repo.local}/${pom.groupId}/properties/merlin.properties"
+ toDir="${maven.build.dir}/classes" verbose="yes"/>
</postGoal>
- -->
+ <!--
+ Aggregate dependent jars into the jar created by this project so that we
+ has a single reference jar file for convinient deployment.
+ -->
<preGoal name="jar:jar">
<j:forEach var="dep" items="${pom.dependencies}">
<j:if test="${dep.getId() != 'junit:junit'}">
1.18 +0 -5 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 13 Dec 2003 18:25:55 -0000 1.17
+++ project.xml 14 Dec 2003 09:56:08 -0000 1.18
@@ -21,11 +21,6 @@
<version>1.2-dev</version>
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-main</artifactId>
- <version>3.2-dev</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
1.21 +15 -3
avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
Index: AbstractMerlinTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractMerlinTestCase.java 13 Dec 2003 18:25:55 -0000 1.20
+++ AbstractMerlinTestCase.java 14 Dec 2003 09:56:08 -0000 1.21
@@ -69,7 +69,6 @@
import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContext;
import org.apache.avalon.repository.main.DefaultBuilder;
-import org.apache.avalon.merlin.main.DefaultMerlinBuilder;
import org.apache.avalon.util.env.Env;
import org.apache.avalon.util.exception.ExceptionHelper;
@@ -88,6 +87,10 @@
// static
//----------------------------------------------------------
+ private static final String MERLIN_PROPERTIES = "merlin.properties";
+
+ private static final String IMPLEMENTATION_KEY = "merlin.implementation";
+
private static final String APPLICANCE_CLASSNAME =
"org.apache.avalon.activation.appliance.Appliance";
@@ -120,14 +123,23 @@
public void setUp() throws Exception
{
+ ClassLoader classloader = AbstractMerlinTestCase.class.getClassLoader();
+
try
{
File repository = new File( getMavenHome(), "repository" );
+ Artifact artifact =
+ DefaultBuilder.createImplementationArtifact(
+ classloader,
+ getBaseDirectory(),
+ MERLIN_PROPERTIES,
+ IMPLEMENTATION_KEY );
+
InitialContext context =
new DefaultInitialContext( repository );
- Builder builder = new DefaultMerlinBuilder( context );
+ Builder builder = new DefaultBuilder( context, artifact );
m_classloader = builder.getClassLoader();
Factory factory = builder.getFactory();
Map criteria = factory.createDefaultCriteria();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
