mcconnell 2003/11/17 08:51:53
Modified: repository/api/src/java/org/apache/avalon/repository
ArtifactDescriptor.java RepositoryUtils.java
repository/main maven.xml
repository/main/src/java/org/apache/avalon/repository
InitialRepositoryFactory.java
repository maven.xml
repository/test maven.xml
Log:
This commit is kind of strange because it makes everything work (wrt test cases) but
it is failed because it is hacking the fact that the ibiblio resouces are being chaced
and the local resources are motre up-to-dste and we are checking for this. What this
means is that the CVS will break in a few hours.
Revision Changes Path
1.5 +2 -2
avalon-sandbox/repository/api/src/java/org/apache/avalon/repository/ArtifactDescriptor.java
Index: ArtifactDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/api/src/java/org/apache/avalon/repository/ArtifactDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ArtifactDescriptor.java 17 Nov 2003 11:20:05 -0000 1.4
+++ ArtifactDescriptor.java 17 Nov 2003 16:51:53 -0000 1.5
@@ -89,7 +89,7 @@
// ------------------------------------------------------------------------
/**
- * Creates a descriptor by breaking apart a Merlin artifact specification
+ * Creates a descriptor by breaking apart an artifact specification
* String into its various components. The type of the descriptor is
* automatically presumed to be of the jar type. Merlin represents a jar
* artifact using the following syntax: [group]:[artifact];[version].
1.7 +18 -2
avalon-sandbox/repository/api/src/java/org/apache/avalon/repository/RepositoryUtils.java
Index: RepositoryUtils.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/api/src/java/org/apache/avalon/repository/RepositoryUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RepositoryUtils.java 17 Nov 2003 15:57:17 -0000 1.6
+++ RepositoryUtils.java 17 Nov 2003 16:51:53 -0000 1.7
@@ -177,12 +177,28 @@
*/
public static Properties getProperties( URL a_url ) throws IOException
{
-System.out.println( "## GETTING PROPERTIES FOR URL: " + a_url );
+
+ //
+ // TODO:
+ // this method is not using the local cache
+ //
+
+ //
+ // TODO2:
+ // This request is not checking the date of the remote resources
+ // relative to a cached value. If the remote resource is cached
+ // remotely we may not be picking up the good values. I.e. out
+ // local resouce in the context classloader may be more up-to-date.
+ //
+
+//System.out.println( "## GETTING PROPERTIES FOR URL: " + a_url );
InputStream l_in = null ;
Properties l_props = new Properties() ;
l_in = a_url.openStream() ;
l_props.load( l_in ) ;
+//System.out.println( "## PROPS: " + l_props );
+
if ( l_in != null )
{
l_in.close() ;
1.3 +1 -1 avalon-sandbox/repository/main/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/main/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 17 Nov 2003 15:57:17 -0000 1.2
+++ maven.xml 17 Nov 2003 16:51:53 -0000 1.3
@@ -1,4 +1,4 @@
-<project default="merlin:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<!--
###########################################################################
1.3 +3 -2
avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/InitialRepositoryFactory.java
Index: InitialRepositoryFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/InitialRepositoryFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InitialRepositoryFactory.java 17 Nov 2003 15:57:17 -0000 1.2
+++ InitialRepositoryFactory.java 17 Nov 2003 16:51:53 -0000 1.3
@@ -83,7 +83,8 @@
public class InitialRepositoryFactory implements RepositoryFactory
{
public static final String AVALON_ARTIFACT_DEPENDENCY =
- "avalon.artifact.dependency";
+ //"avalon.artifact.dependency";
+ "avalon.dependency"; // use cached version
public static final String REPOSITORY_GROUP_NAME =
"avalon-repository" ;
1.7 +1 -2 avalon-sandbox/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 17 Nov 2003 15:57:17 -0000 1.6
+++ maven.xml 17 Nov 2003 16:51:53 -0000 1.7
@@ -1,4 +1,4 @@
-<project default="merlin:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<ant:property name="pom.organization.identifier" value="ASF"/>
<ant:property name="pom.specificationVersion" value="1.2"/>
@@ -10,7 +10,6 @@
goals="jar:install"
banner="Installing:"
ignoreFailures="false" />
- <attainGoal name="merlin:plugin"/>
</goal>
<goal name="avalon:clean" prereqs="clean">
1.2 +1 -1 avalon-sandbox/repository/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/test/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 17 Nov 2003 08:20:35 -0000 1.1
+++ maven.xml 17 Nov 2003 16:51:53 -0000 1.2
@@ -1,4 +1,4 @@
-<project default="merlin:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="test:test" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<preGoal name="test:test">
<ant:mkdir dir="${maven.build.dir}/repository"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
