You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/12/27 05:04:51 UTC
svn commit: r729589 - in /maven/mercury/trunk: ./ mercury-ant/
mercury-ant/mercury-ant-tasks/
mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks...
Author: ogusakov
Date: Fri Dec 26 20:04:51 2008
New Revision: 729589
URL: http://svn.apache.org/viewvc?rev=729589&view=rev
Log:
[MERCURY-65,MERCURY-68] intermediate changes for ant tasks, applied Ben's path
Added:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom (with props)
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/pom.xml
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
maven/mercury/trunk/mercury-ant/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java
maven/mercury/trunk/pom.xml
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml Fri Dec 26 20:04:51 2008
@@ -224,12 +224,12 @@
<target name="compile-thin-path-3" depends="init">
-
- <repository id="localPath3" dir="${basedir}/target/path-3"/>
-
+
+ <repository id="localPath3" dir="${basedir}/target/path-3"/>
+
<repository id="remotePath3" url="http://localhost:${repo.port}/maven2">
<auth name="foo" pass="bar"/>
- </repository>
+ </repository>
<javac srcdir="${src}"
destdir="${target}"
@@ -244,5 +244,27 @@
</javac>
</target>
+
+ <target name="compile-thin-path-pom" depends="init">
+
+ <repository id="localPath3" dir="${basedir}/target/path-pom"/>
+
+ <repository id="remotePath3" url="http://localhost:${repo.port}/maven2">
+ <auth name="foo" pass="bar"/>
+ </repository>
+
+ <javac srcdir="${src}"
+ destdir="${target}"
+ source="${compiler.version}"
+ target="${compiler.version}"
+ >
+ <classpath>
+ <deps>
+ <dependency name="t:t:3.0::pom" pom="${basedir}/target/test-classes/" />
+ </deps>
+ </classpath>
+ </javac>
+
+ </target>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/pom.xml?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/pom.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/pom.xml Fri Dec 26 20:04:51 2008
@@ -55,7 +55,7 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-virtual</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
@@ -63,6 +63,11 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-map</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
</dependency>
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Fri Dec 26 20:04:51 2008
@@ -55,6 +55,8 @@
return null;
List<ArtifactBasicMetadata> res = new ArrayList<ArtifactBasicMetadata>( _dependencies.size() );
+
+
for ( Dependency d : _dependencies )
{
@@ -65,7 +67,14 @@
res.add( d._amd );
else
{
+
+// vr.addRepository( repo );
+
ArtifactMetadata deps = vr.readDependencies( d._amd );
+
+ if( deps != null && !Util.isEmpty( deps.getDependencies() ) )
+ for( ArtifactBasicMetadata bmd : deps.getDependencies() )
+ res.add( bmd );
}
}
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java Fri Dec 26 20:04:51 2008
@@ -319,6 +319,37 @@
File asm = new File( "target/path-3/asm/asm/3.0/asm-3.0.jar" );
+ FileUtil.delete( asm );
+
+ asm.delete();
+
+ assertFalse( asm.exists() );
+
+ executeTarget( title );
+
+ assertTrue( af.exists() );
+
+ assertTrue( asm.exists() );
+ }
+
+ // -----------------------------------
+ public void testCompileThinPathPom()
+ throws Exception
+ {
+ String title = "compile-thin-path-pom";
+ System.out.println( "========> start " + title );
+ System.out.flush();
+
+ restart( _port, _remoteRepoDirFile, "/maven2", true );
+
+ File af = new File( _compileDirFile, "T.class" );
+
+ assertFalse( af.exists() );
+
+ File asm = new File( "target/path-pom/asm/asm/3.0/asm-3.0.jar" );
+
+ FileUtil.delete( asm );
+
asm.delete();
assertFalse( asm.exists() );
Added: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom?rev=729589&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom (added)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom Fri Dec 26 20:04:51 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>t</groupId>
+ <artifactId>t</artifactId>
+ <version>3.0</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/resources/t-3.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/mercury/trunk/mercury-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/pom.xml?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/pom.xml (original)
+++ maven/mercury/trunk/mercury-ant/pom.xml Fri Dec 26 20:04:51 2008
@@ -118,12 +118,18 @@
<artifactId>mercury-repo-virtual</artifactId>
<version>${mercury.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
<version>${mercury.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-map</artifactId>
+ <version>${mercury.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java Fri Dec 26 20:04:51 2008
@@ -69,6 +69,7 @@
a = new DefaultArtifact( new ArtifactBasicMetadata("a:a:1.0.0") );
File ant = File.createTempFile( "test-flat", "-repo" );
+ ant.deleteOnExit();
InputStream in = LocalRepositoryFlatTest.class.getResourceAsStream( "/ant-1.6.5.jar" );
FileUtil.writeRawData( ant, in );
a.setFile( ant );
@@ -77,12 +78,20 @@
b = new DefaultArtifact( new ArtifactBasicMetadata("b:b:1.0.0") );
File antlr = File.createTempFile( "test-flat", "-repo" );
+ antlr.deleteOnExit();
in = LocalRepositoryFlatTest.class.getResourceAsStream( "/antlr-2.7.7.jar" );
FileUtil.writeRawData( antlr, in );
b.setFile( antlr );
b.setPomBlob( pomBlob );
}
-
+
+ @Override
+ protected void tearDown()
+ throws Exception
+ {
+ FileUtil.delete( _dir );
+ }
+
public void testWriteFlat()
throws Exception
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java Fri Dec 26 20:04:51 2008
@@ -31,6 +31,7 @@
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
import org.apache.maven.mercury.repository.api.RepositoryReader;
import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
+import org.apache.maven.mercury.util.FileUtil;
/**
* @author Oleg Gusakov
@@ -58,8 +59,10 @@
bmd = new ArtifactBasicMetadata("t:t:1.0::pom");
_pom = new File("./target/test-classes/t-1.0.pom");
-
- _storage = new DefaultStorage();
+
+ _dir = File.createTempFile( "temp-", "-mercury-default-storage" );
+ _dir.delete();
+ _storage = new DefaultStorage( _dir );
_storage.add( bmd.getGAV(), _pom );
@@ -71,6 +74,13 @@
}
+ @Override
+ protected void tearDown()
+ throws Exception
+ {
+ FileUtil.delete( _dir );
+ }
+
public void testReadMap()
throws Exception
{
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java Fri Dec 26 20:04:51 2008
@@ -139,6 +139,7 @@
{
Artifact a = new DefaultArtifact( new ArtifactBasicMetadata("a:a:1.0:text:txt") );
File bin = File.createTempFile( "vr-", "-test.txt" );
+ bin.deleteOnExit();
FileUtil.writeRawData( bin, "test" );
a.setFile( bin );
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/BatchFilterTest.java Fri Dec 26 20:04:51 2008
@@ -82,6 +82,7 @@
}
}
f.delete();
+ f.deleteOnExit();
}
public void testHandlePutWithoutBatching() throws Exception
Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Fri Dec 26 20:04:51 2008
@@ -312,16 +312,21 @@
throws IOException
{
OutputStream out = new FileOutputStream( f );
+ try
+ {
+ byte [] buf = new byte[ DEFAULT_BUFFER_SIZE ];
+ int n;
- byte [] buf = new byte[ DEFAULT_BUFFER_SIZE ];
- int n;
-
- while( (n = in.read( buf ) ) > 0 )
- out.write( buf, 0, n );
+ while( (n = in.read( buf ) ) > 0 )
+ out.write( buf, 0, n );
+ out.flush();
+ }
+ finally
+ {
+ out.close();
+ }
in.close();
- out.flush();
- out.close();
}
//---------------------------------------------------------------------------------------------------------------
public static File writeTempData( byte [] bytes )
Modified: maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java (original)
+++ maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/NioTest.java Fri Dec 26 20:04:51 2008
@@ -44,6 +44,7 @@
try
{
File file = File.createTempFile( "test-nio-", "-file" );
+ file.deleteOnExit();
String fn = file.getAbsolutePath();
@@ -72,6 +73,7 @@
l1.release();
c1.close();
+ c2.close();
file.delete();
Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=729589&r1=729588&r2=729589&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Fri Dec 26 20:04:51 2008
@@ -241,12 +241,18 @@
<artifactId>mercury-repo-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-map</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>