mcconnell 2004/02/20 14:48:13
Modified: repository/api/src/java/org/apache/avalon/repository
Artifact.java
repository/impl maven.xml
Log:
Improve artificate toString handling and upgrade the repository criteria to use the
improved defaults management.
Revision Changes Path
1.6 +4 -4
avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file:
/home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Artifact.java 10 Feb 2004 19:52:05 -0000 1.5
+++ Artifact.java 20 Feb 2004 22:48:13 -0000 1.6
@@ -312,13 +312,13 @@
if( "block".equals( getType() ) )
{
String path = "block:" + getGroup() + "/" + getName();
- if( getVersion() != null ) path = path + "?version=" + getVersion();
+ if( getVersion() != null ) path = path + "#" + getVersion();
return path;
}
else if( "jar".equals( getType() ) )
{
String path = "artifact:" + getGroup() + "/" + getName();
- if( getVersion() != null ) path = path + "?version=" + getVersion();
+ if( getVersion() != null ) path = path + "#" + getVersion();
return path;
}
else
@@ -326,7 +326,7 @@
String path = "artifact:" + getGroup() + "/" + getName();
if( getVersion() != null )
{
- path = path + "?version=" + getVersion();
+ path = path + "#" + getVersion();
if( getType() != null ) path = path + "&type=" + getType();
return path;
}
1.4 +5 -0 avalon/repository/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 8 Dec 2003 12:48:48 -0000 1.3
+++ maven.xml 20 Feb 2004 22:48:13 -0000 1.4
@@ -1,7 +1,12 @@
<project default="jar:install" xmlns:ant="jelly:ant">
+
+ <ant:property name="criteriaClass"
+ value="org/apache/avalon/repository/impl/DefaultRepositoryCriteria"/>
+
<postGoal name="test:test">
<attainGoal name="avalon:artifact"/>
</postGoal>
+
<postGoal name="jar:install">
<ant:copy toDir="${maven.repo.local}/${pom.groupId}/jars">
<fileset dir="${maven.build.dir}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
