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 2009/02/14 05:36:23 UTC
svn commit: r744389 - in /maven/mercury/trunk/mercury-ant-tasks: ./
src/main/java/org/apache/maven/mercury/ant/tasks/
src/main/resources/org/apache/maven/mercury/ant/tasks/
src/test/java/org/apache/maven/mercury/ant/tasks/ src/test/resources/
src/test/...
Author: ogusakov
Date: Sat Feb 14 04:36:21 2009
New Revision: 744389
URL: http://svn.apache.org/viewvc?rev=744389&view=rev
Log:
[MNG-3969] intermediate commit
Added:
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.jar
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.jar
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.jar
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom (with props)
maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml (with props)
Modified:
maven/mercury/trunk/mercury-ant-tasks/mercury.xml
maven/mercury/trunk/mercury-ant-tasks/pom.xml
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml
Modified: maven/mercury/trunk/mercury-ant-tasks/mercury.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/mercury.xml?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/mercury.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/mercury.xml Sat Feb 14 04:36:21 2009
@@ -1,8 +1,11 @@
-<project name="build" default="build" xmlns:mercury="urn:mercury">
+<project name="build" default="build" xmlns:mercury="antlib:org.apache.maven.mercury.ant.tasks">
<target name="initialize">
- <path id="boot.classpath" path="mercury-all-1.0.jar" />
- <typedef resource="org/apache/maven/mercury/ant/antlib.xml" uri="urn:mercury" classpathref="boot.classpath"/>
+<!-- <path id="boot.classpath" path="target/mercury-all-1.0.jar" />
+ <taskdef resource="org/apache/maven/mercury/ant/antlib.xml" uri="urn:mercury" classpathref="boot.classpath"/>
+ <taskdef resource="org/apache/maven/mercury/ant/antlib.xml" uri="urn:mercury"/>
+-->
+
</target>
<!--
@@ -59,12 +62,25 @@
| are setup for you.
|
-->
+
+ <!-- redefine local and central for testing -->
+ <mercury:local-repository location="${localRepo}"/>
+ <mercury:remote-repository url="${remoteRepo}"/>
+
<mercury:resolve-dependencies>
<mercury:dependency id="g0:a0:v0"/>
<mercury:dependency id="g1:a1:v1"/>
<mercury:dependency id="g2:a2:v2"/>
</mercury:resolve-dependencies>
+ </target>
+
+ <target name="download-pom" depends="initialize">
+
+ <!-- redefine local and central for testing -->
+ <mercury:local-repository location="${localRepo}"/>
+ <mercury:remote-repository url="${remoteRepo}"/>
+
<!-- (2) -->
<!--
|
@@ -75,9 +91,24 @@
| to use the Maven dependency processor and a local pom.xml file.
|
-->
- <mercury:resolve-dependencies source="maven:pom.xml"/>
+ <mercury:resolve-dependencies id="g:a:1::pom" source="maven:${basedir}/target/test-classes/pom.xml"/>
- <mercury:resolve-dependencies source="maven:pom.xml" transitive="false"/>
+ </target>
+
+
+ <target name="download-pom-transtive-false">
+
+ <!-- redefine local and central for testing -->
+ <mercury:local-repository location="${localRepo}"/>
+ <mercury:remote-repository url="${remoteRepo}"/>
+
+ <mercury:resolve-dependencies source="maven:pom.xml"/>
+ <mercury:resolve-dependencies transitive="false" source="maven:${basedir}/target/test-classes/pom.xml" id="g:a:1::pom" />
+
+ </target>
+
+
+ <target name="download-repos">
<mercury:resolve-dependencies source="maven:pom.xml">
<mercury:local-repository location="${basedir}/lib" layout="flat"/>
@@ -115,7 +146,7 @@
</target>
- <target name="build">
+ <target name="build" depends="initialize">
<javac srcdir="src/main/java" destdir="target/classes">
<classpath refid="mercury.classpath.compile"/>
</javac>
Modified: maven/mercury/trunk/mercury-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/pom.xml?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/pom.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/pom.xml Sat Feb 14 04:36:21 2009
@@ -1,30 +1,29 @@
<?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">
+ <!--
+ 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>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0-alpha-6-SNAPSHOT</version>
+ <version>1.0-alpha-5</version>
</parent>
<artifactId>mercury-ant-tasks</artifactId>
@@ -53,37 +52,47 @@
<!-- Mercury deps -->
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
+ <groupId>org.apache.maven.mercury
+ </groupId>
<artifactId>mercury-artifact</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
+ <groupId>org.apache.maven.mercury
+ </groupId>
<artifactId>mercury-external</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
+ <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>
+ <groupId>org.apache.maven.mercury
+ </groupId>
+ <artifactId>mercury-repo-local-m2
+ </artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-map</artifactId>
+ <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>
+ <groupId>org.apache.maven.mercury
+ </groupId>
+ <artifactId>mercury-repo-remote-m2
+ </artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
+ <groupId>org.apache.maven.mercury
+ </groupId>
<artifactId>mercury-md-sat</artifactId>
</dependency>
@@ -119,10 +128,18 @@
<version>${maven.version}</version>
</dependency>
+ <!--
+ <dependency> <groupId>org.apache.maven</groupId>
+ <artifactId>maven-embedder</artifactId>
+ <version>${maven.version}</version> </dependency>
+ -->
+
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
+ <groupId>org.apache.maven.mercury
+ </groupId>
+ <artifactId>mercury-transport-http
+ </artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -140,6 +157,7 @@
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
@@ -155,29 +173,42 @@
</goals>
<configuration>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <shadedArtifactAttached>false</shadedArtifactAttached>
- <createDependencyReducedPom>false</createDependencyReducedPom>
+ <keepDependenciesWithProvidedScope>true
+ </keepDependenciesWithProvidedScope>
+ <shadedArtifactAttached>false
+ </shadedArtifactAttached>
+ <createDependencyReducedPom>false
+ </createDependencyReducedPom>
<artifactSet>
<excludes>
<exclude>ant:ant</exclude>
- <exclude>org.bouncycastle:bcprov-jdk15</exclude>
- <exclude>org.bouncycastle:bcpg-jdk15</exclude>
- <exclude>bouncycastle:bcprov-jdk15</exclude>
- <exclude>bouncycastle:bcpg-jdk15</exclude>
-
- <exclude>org.mortbay.jetty:jetty</exclude>
- <exclude>org.mortbay.jetty:jetty-util5</exclude>
- <exclude>org.mortbay.jetty:jetty-util</exclude>
- <exclude>org.mortbay.jetty:jetty-sslengine</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15
+ </exclude>
+ <exclude>org.bouncycastle:bcpg-jdk15
+ </exclude>
+ <exclude>bouncycastle:bcprov-jdk15
+ </exclude>
+ <exclude>bouncycastle:bcpg-jdk15
+ </exclude>
+
+ <exclude>org.mortbay.jetty:jetty
+ </exclude>
+ <exclude>org.mortbay.jetty:jetty-util5
+ </exclude>
+ <exclude>org.mortbay.jetty:jetty-util
+ </exclude>
+ <exclude>org.mortbay.jetty:jetty-sslengine
+ </exclude>
</excludes>
</artifactSet>
<filters>
<filter>
<excludes>
- <exclude>/META-INF/BCKEY.DSA</exclude>
- <exclude>/META-INF/BCKEY.SF</exclude>
+ <exclude>/META-INF/BCKEY.DSA
+ </exclude>
+ <exclude>/META-INF/BCKEY.SF
+ </exclude>
</excludes>
</filter>
</filters>
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Sat Feb 14 04:36:21 2009
@@ -19,11 +19,12 @@
extends AbstractDataType
{
private static final Language LANG = new DefaultLanguage( Config.class );
+
+ public static final String SYSTEM_PROPERTY_CENTRAL_URL = "mercury.central.url";
+
+ public static final String SYSTEM_PROPERTY_LOCAL_DIR_NAME = "mercury.repo.local";
- public static final String DEFAULT_LOCAL_DIR = System.getProperty( "user.home" ) + "/.m2/repository";
-
- public static final String DEFAULT_CENTRAL_URL =
- System.getProperty( "mercury.central.url", "http://repo1.maven.org/maven2" );
+ public static final String DEFAULT_LOCAL_DIR_NAME = "/.m2/repository";
public static final String DEFAULT_CONFIG_ID =
System.getProperty( "mercury.default.config.id", "mercury.default.config.id." + System.currentTimeMillis() );
@@ -44,11 +45,25 @@
{
Repo local = createRepo();
local.setId( "defaultLocalRepo" );
- local.setDir( ( localDir == null ) ? DEFAULT_LOCAL_DIR : localDir );
+
+ String localDirName = ( localDir == null )
+ ? System.getProperty( SYSTEM_PROPERTY_LOCAL_DIR_NAME,
+ System.getProperty( "user.home" ) + DEFAULT_LOCAL_DIR_NAME
+ )
+ : localDir
+ ;
+
+ local.setDir( localDirName );
Repo central = createRepo();
central.setId( "central" );
- central.setUrl( ( remoteUrl == null ) ? DEFAULT_CENTRAL_URL : remoteUrl );
+
+ String centralUrl = ( remoteUrl == null )
+ ? System.getProperty( SYSTEM_PROPERTY_CENTRAL_URL, "http://repo1.maven.org/maven2" )
+ : remoteUrl
+ ;
+
+ central.setUrl( centralUrl );
}
public List<Repository> getRepositories()
Modified: maven/mercury/trunk/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-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Sat Feb 14 04:36:21 2009
@@ -57,6 +57,36 @@
private LocalRepositoryMap _pomRepo;
private Storage _pomStorage;
+
+ private Dependency _sourceDependency;
+
+
+ /**
+ * @param vr
+ * @throws MavenEmbedderException
+ */
+// private MavenEmbedder createEmbedder( VirtualRepositoryReader vr )
+// throws MavenEmbedderException
+// {
+// Configuration configuration = new DefaultConfiguration()
+// .setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE )
+// .setGlobalSettingsFile( MavenEmbedder.DEFAULT_GLOBAL_SETTINGS_FILE )
+// .setClassLoader( Thread.currentThread().getContextClassLoader() )
+// ;
+//
+// ConfigurationValidationResult validationResult = MavenEmbedder.validateConfiguration( configuration );
+//
+// if ( validationResult.isValid() )
+// {
+// // If the configuration is valid then do your thang ...
+// }
+//
+// MavenEmbedder embedder = new MavenEmbedder( configuration );
+//
+// PlexusContainer container = embedder.getPlexusContainer();
+//
+// return embedder;
+// }
private List<ArtifactBasicMetadata> getDependencies( VirtualRepositoryReader vr )
throws RepositoryException
@@ -70,6 +100,7 @@
for ( Dependency d : _dependencies )
{
+
if ( d._amd == null )
{
throw new IllegalArgumentException( LANG.getMessage( "dep.dependency.name.mandatory" ) );
@@ -133,6 +164,31 @@
return resolve( config, _scope );
}
//----------------------------------------------------------------------------------------
+// protected ArtifactRepository getLocalRepository( String path )
+// throws Exception
+// {
+// ArtifactRepositoryLayout repoLayout = new DefaultRepositoryLayout();
+//
+// ArtifactRepository r = new DefaultArtifactRepository( "local",
+// "file://" + path,
+// repoLayout );
+//
+// return r;
+// }
+
+// protected MavenProject getProject( File pom, ArtifactRepository localRepo )
+// throws Exception
+// {
+// Properties props = System.getProperties();
+// ProfileActivationContext ctx = new DefaultProfileActivationContext( props, false );
+//
+// ProjectBuilderConfiguration pbc = new DefaultProjectBuilderConfiguration();
+// pbc.setLocalRepository( localRepo );
+// pbc.setGlobalProfileManager( new DefaultProfileManager( getContainer(), ctx ) );
+//
+// return projectBuilder.build( pom, pbc );
+// }
+ //----------------------------------------------------------------------------------------
protected List<Artifact> resolve( Config config, ArtifactScopeEnum scope )
throws Exception
{
@@ -160,8 +216,9 @@
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
- List<ArtifactMetadata> res =
- db.resolveConflicts( scope, new ArtifactQueryList( getDependencies( vr ) ), null, null );
+ List<ArtifactBasicMetadata> depList = getDependencies( vr );
+
+ List<ArtifactMetadata> res = db.resolveConflicts( scope, new ArtifactQueryList( depList ), null, null );
if ( Util.isEmpty( res ) )
{
@@ -231,6 +288,25 @@
{
this._scope = scope;
}
+
+ @Override
+ public void setId( String id )
+ {
+ super.setId( id );
+
+ if( _sourceDependency != null )
+ _sourceDependency.setId( id );
+ }
+
+ public void setSource( String pom )
+ {
+ _sourceDependency = createDependency();
+
+ if( getId() != null )
+ _sourceDependency.setId( getId() );
+
+ _sourceDependency.setPom( pom );
+ }
public void setTransitive( boolean val )
{
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java Sat Feb 14 04:36:21 2009
@@ -21,6 +21,9 @@
String _pom;
boolean _optional = false;
+
+ /** dependency processor type, if any */
+ String _processor;
public void setName( String name )
{
@@ -29,6 +32,11 @@
_amd.setOptional( _optional );
}
+ public void setId( String name )
+ {
+ setName( name );
+ }
+
public void setOptional( boolean optional )
{
this._optional = optional;
@@ -41,12 +49,20 @@
public void setPom( String pom )
{
- this._pom = pom;
-
- if ( _amd == null )
+ int pos = pom.indexOf( ':' );
+
+ if( pos != -1 )
{
- throw new UnsupportedOperationException( LANG.getMessage( "dep.dependency.pom.needs.name", pom ) );
+ this._processor = pom.substring( 0, pos );
+ this._pom = pom.substring( pos+1 );
}
+ else
+ this._pom = pom;
+
+if ( _amd == null )
+{
+ throw new UnsupportedOperationException( LANG.getMessage( "dep.dependency.pom.needs.name", pom ) );
+}
}
public void setGroupId( String groupId )
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java Sat Feb 14 04:36:21 2009
@@ -144,6 +144,12 @@
setDir( path );
}
+ // alternative - Jason's - syntax
+ public void setLocation( String path )
+ {
+ setDir( path );
+ }
+
public void setType( String type )
{
this._type = type;
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java Sat Feb 14 04:36:21 2009
@@ -37,9 +37,13 @@
private String _depId;
+ private String _id;
+
private ArtifactScopeEnum _scope = ArtifactScopeEnum.compile;
private List<Dependency> _dependencies;
+
+ private Dependency _sourceDependency;
// ----------------------------------------------------------------------------------------
@Override
@@ -247,6 +251,29 @@
this._scope = scope;
}
+ public void setName( String name )
+ {
+ setId( name );
+ }
+
+ public void setId( String id )
+ {
+ this._id = id;
+
+ if( _sourceDependency != null )
+ _sourceDependency.setId( id );
+ }
+
+ public void setSource( String pom )
+ {
+ _sourceDependency = createDependency();
+
+ if( _id != null )
+ _sourceDependency.setId( _id );
+
+ _sourceDependency.setPom( pom );
+ }
+
public Dependency createDependency( )
{
if ( Util.isEmpty( _dependencies ) )
Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml?rev=744389&r1=744388&r2=744389&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml Sat Feb 14 04:36:21 2009
@@ -22,7 +22,7 @@
<!-- good old syntax -->
<taskdef name="dependencies" classname="org.apache.maven.mercury.ant.tasks.ResolveTask"/>
- <taskdef name="resolve-dependencies" classname="org.apache.maven.mercury.ant.tasks.ResolveTask"/>
+ <taskdef name="resolve-dependencies" classname="org.apache.maven.mercury.ant.tasks.ResolveTask"/>
<typedef name="localRepository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
<typedef name="local-repository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java Sat Feb 14 04:36:21 2009
@@ -0,0 +1,147 @@
+package org.apache.maven.mercury.ant.tasks;
+
+import java.io.File;
+
+import org.apache.maven.mercury.spi.http.server.AuthenticatingTestServer;
+import org.apache.maven.mercury.util.FileUtil;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.types.Path;
+
+/**
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class MercuryBootstrapTest
+ extends BuildFileTest
+{
+ static final String _localRepoDir = "./target/repo-bootstrap";
+
+ static File _localRepoDirFile;
+
+ static final String _writeRepoDir = "./target/test-repo-flat";
+
+ static File _writeRepoDirFile;
+
+ static final String _remoteRepoDir = "./target/test-classes/remoteRepoBoot";
+
+ static File _remoteRepoDirFile;
+
+ static final String _remoteRepoUrlPrefix = "http://localhost:";
+
+ static final String _remoteRepoUrlSufix = "/maven2";
+
+ static final String _pathId = "class-path";
+
+ AuthenticatingTestServer _jetty;
+
+ int _port;
+ static final int DEFAULT_PORT = 22883;
+ // -----------------------------------
+ public MercuryBootstrapTest( String name )
+ {
+ super( name );
+ }
+
+ // -----------------------------------
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ _localRepoDirFile = new File( _localRepoDir );
+ FileUtil.delete( _localRepoDirFile );
+ _localRepoDirFile.mkdirs();
+
+ _remoteRepoDirFile = new File( _remoteRepoDir );
+ _jetty = new AuthenticatingTestServer( 0, _remoteRepoDirFile, _remoteRepoUrlSufix, false );
+ _jetty.start();
+ _port = _jetty.getPort();
+
+ _writeRepoDirFile = new File( _writeRepoDir );
+ FileUtil.delete( _writeRepoDirFile );
+ _writeRepoDirFile.mkdirs();
+
+ configureProject( "mercury.xml" );
+
+// System.setProperty( Config.SYSTEM_PROPERTY_LOCAL_DIR_NAME, _localRepoDir );
+ getProject().setProperty( "localRepo", _localRepoDir );
+
+// System.setProperty( Config.SYSTEM_PROPERTY_CENTRAL_URL, _remoteRepoUrlPrefix+_port+_remoteRepoUrlSufix );
+ getProject().setProperty( "remoteRepo", _remoteRepoUrlPrefix+_port+_remoteRepoUrlSufix );
+
+ getProject().setProperty( "repo.port", "" + _port );
+ }
+
+ // -----------------------------------
+ private void restart( int port, File localBase, String remotePathFragment, boolean secured )
+ throws Exception
+ {
+ tearDown();
+
+ _jetty = new AuthenticatingTestServer( port, localBase, remotePathFragment, secured );
+ _jetty.start();
+
+ this._port = port;
+ }
+
+ // -----------------------------------
+ @Override
+ protected void tearDown()
+ throws Exception
+ {
+ if( _jetty != null )
+ {
+ _jetty.stop();
+ _jetty.destroy();
+
+ System.out.println( "Jetty on :" + _port + " destroyed\n<========\n\n" );
+ }
+ }
+
+ //-----------------------------------
+ public void testDownload()
+ {
+ String title = "download";
+ System.out.println( "========> start " + title );
+ System.out.flush();
+
+ File a0 = new File( _localRepoDirFile, "g0/a0/v0/a0-v0.jar" );
+ File a1 = new File( _localRepoDirFile, "g1/a1/v1/a1-v1.jar" );
+ File a2 = new File( _localRepoDirFile, "g2/a2/v2/a2-v2.jar" );
+
+ assertFalse( a0.exists() );
+ assertFalse( a1.exists() );
+ assertFalse( a2.exists() );
+
+ executeTarget( title );
+
+ assertTrue( a0.exists() );
+ assertTrue( a1.exists() );
+ assertTrue( a2.exists() );
+ }
+
+ //-----------------------------------
+ public void testDownloadPom()
+ {
+ String title = "download-pom";
+ System.out.println( "========> start " + title );
+ System.out.flush();
+
+ File a0 = new File( _localRepoDirFile, "g0/a0/v0/a0-v0.jar" );
+ File a1 = new File( _localRepoDirFile, "g1/a1/v1/a1-v1.jar" );
+ File a2 = new File( _localRepoDirFile, "g2/a2/v2/a2-v2.jar" );
+
+ assertFalse( a0.exists() );
+ assertFalse( a1.exists() );
+ assertFalse( a2.exists() );
+
+ executeTarget( title );
+
+ assertTrue( a0.exists() );
+ assertTrue( a1.exists() );
+ assertTrue( a2.exists() );
+ }
+ //-----------------------------------
+ //-----------------------------------
+}
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,51 @@
+<?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>g</groupId>
+ <artifactId>a</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>g0</groupId>
+ <artifactId>a0</artifactId>
+ <version>v0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>g1</groupId>
+ <artifactId>a1</artifactId>
+ <version>v1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>g2</groupId>
+ <artifactId>a2</artifactId>
+ <version>v2</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>g0</groupId>
+ <artifactId>a0</artifactId>
+ <version>v0</version>
+ <versioning>
+ <versions>
+ <version>v0</version>
+ </versions>
+ </versioning>
+</metadata>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.jar
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.jar?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.jar (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.jar Sat Feb 14 04:36:21 2009
@@ -0,0 +1 @@
+jar
\ No newline at end of file
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom Sat Feb 14 04:36:21 2009
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>g0</groupId>
+ <artifactId>a0</artifactId>
+ <version>v0</version>
+</project>
\ No newline at end of file
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/a0-v0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>g0</groupId>
+ <artifactId>a0</artifactId>
+ <version>v0</version>
+ <versioning>
+ <versions>
+ <version>v0</version>
+ </versions>
+ </versioning>
+</metadata>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g0/a0/v0/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>g1</groupId>
+ <artifactId>a1</artifactId>
+ <version>v1</version>
+ <versioning>
+ <versions>
+ <version>v1</version>
+ </versions>
+ </versioning>
+</metadata>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.jar
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.jar?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.jar (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.jar Sat Feb 14 04:36:21 2009
@@ -0,0 +1 @@
+jar
\ No newline at end of file
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom Sat Feb 14 04:36:21 2009
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>g1</groupId>
+ <artifactId>a1</artifactId>
+ <version>v1</version>
+</project>
\ No newline at end of file
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/a1-v1.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>g1</groupId>
+ <artifactId>a1</artifactId>
+ <version>v1</version>
+ <versioning>
+ <versions>
+ <version>v1</version>
+ </versions>
+ </versioning>
+</metadata>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g1/a1/v1/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>g2</groupId>
+ <artifactId>a2</artifactId>
+ <version>v2</version>
+ <versioning>
+ <versions>
+ <version>v2</version>
+ </versions>
+ </versioning>
+</metadata>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.jar
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.jar?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.jar (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.jar Sat Feb 14 04:36:21 2009
@@ -0,0 +1 @@
+jar
\ No newline at end of file
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom Sat Feb 14 04:36:21 2009
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>g2</groupId>
+ <artifactId>a2</artifactId>
+ <version>v2</version>
+</project>
\ No newline at end of file
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/a2-v2.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml?rev=744389&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml (added)
+++ maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml Sat Feb 14 04:36:21 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>g2</groupId>
+ <artifactId>a2</artifactId>
+ <version>v2</version>
+ <versioning>
+ <versions>
+ <version>v2</version>
+ </versions>
+ </versioning>
+</metadata>
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-ant-tasks/src/test/resources/remoteRepoBoot/g2/a2/v2/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Re: svn commit: r744389 - in /maven/mercury/trunk/mercury-ant-tasks:
./ src/main/java/org/apache/maven/mercury/ant/tasks/ src/main/resources/org/apache/maven/mercury/ant/tasks/
src/test/java/org/apache/maven/mercury/ant/tasks/ src/test/resources/ src/test/...
Posted by Benjamin Bentmann <be...@udo.edu>.
Hervé BOUTEMY wrote:
> Sorry to bug you about coding style, but this is important for the whole team
> to be able to maintain code.
+1, also considering that "team" does not only include the committers
but also contributors who can more easily create clean patches when they
don't need to worry about bogus diffs when applying our code style.
Benjamin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r744389 - in /maven/mercury/trunk/mercury-ant-tasks: ./ src/main/java/org/apache/maven/mercury/ant/tasks/ src/main/resources/org/apache/maven/mercury/ant/tasks/ src/test/java/org/apache/maven/mercury/ant/tasks/ src/test/resources/ src/test/...
Posted by Hervé BOUTEMY <he...@free.fr>.
Oleg,
Sorry to bug you about coding style, but this is important for the whole team
to be able to maintain code.
For conditional (and loops):
- one space after if/for statement
- always add a block, even if it's not technically necessary
Regards,
Hervé
Le samedi 14 février 2009, ogusakov@apache.org a écrit :
> Author: ogusakov
> Date: Sat Feb 14 04:36:21 2009
> New Revision: 744389
>
> URL: http://svn.apache.org/viewvc?rev=744389&view=rev
> Log:
> [MNG-3969] intermediate commit
>
[SNAP]
> +
> + @Override
> + public void setId( String id )
> + {
> + super.setId( id );
> +
> + if( _sourceDependency != null )
> + _sourceDependency.setId( id );
> + }
> +
> + public void setSource( String pom )
> + {
> + _sourceDependency = createDependency();
> +
> + if( getId() != null )
> + _sourceDependency.setId( getId() );
> +
> + _sourceDependency.setPom( pom );
> + }
[SNAP]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org