mcconnell 2003/12/13 13:05:56
Modified: merlin/kernel/plugin maven.xml
merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
Log:
Cleanup property reference.
Revision Changes Path
1.5 +2 -2 avalon/merlin/kernel/plugin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 13 Dec 2003 20:59:22 -0000 1.4
+++ maven.xml 13 Dec 2003 21:05:56 -0000 1.5
@@ -7,8 +7,8 @@
# the implementation artifact classpath, factory, etc. #
###################################################################
-->
-
<postGoal name="java:compile">
+ <!--
<ant:echo file="${maven.build.dir}/classes/merlin.implementation">
#===================================================================#
# Default merlin implementation artifact identifier. #
@@ -24,7 +24,7 @@
# EOF
#
</ant:echo>
-
+ -->
<ant:copy
file="${maven.repo.local}/${pom.groupId}/properties/merlin.properties"
toDir="${maven.build.dir}/classes" verbose="yes"/>
1.7 +12 -9
avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
Index: MerlinBean.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MerlinBean.java 13 Dec 2003 18:25:55 -0000 1.6
+++ MerlinBean.java 13 Dec 2003 21:05:56 -0000 1.7
@@ -250,14 +250,17 @@
// otherwise go with the defaults packaged with the jar file
//
- Properties properties = loadProperties( IMPLEMENTATION_PATH );
- final String group =
- properties.getProperty( Artifact.GROUP_KEY );
- final String name =
- properties.getProperty( Artifact.NAME_KEY );
- final String version =
- properties.getProperty( Artifact.VERSION_KEY );
- return Artifact.createArtifact( group, name, version );
+ Properties properties = loadProperties( MERLIN );
+ String specification = properties.getProperty( IMPLEMENTATION_KEY );
+ return Artifact.createArtifact( specification );
+
+ //final String group =
+ // properties.getProperty( Artifact.GROUP_KEY );
+ //final String name =
+ // properties.getProperty( Artifact.NAME_KEY );
+ //final String version =
+ // properties.getProperty( Artifact.VERSION_KEY );
+ //return Artifact.createArtifact( group, name, version );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
