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/31 18:54:20 UTC
svn commit: r730434 - in /maven/mercury/trunk/mercury-ant: ./
mercury-ant-tasks/
mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/
Author: ogusakov
Date: Wed Dec 31 09:54:19 2008
New Revision: 730434
URL: http://svn.apache.org/viewvc?rev=730434&view=rev
Log:
[MERCURY-65] fixed introduced bug, started cleaning the test build script
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml
maven/mercury/trunk/mercury-ant/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=730434&r1=730433&r2=730434&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml Wed Dec 31 09:54:19 2008
@@ -29,7 +29,7 @@
-->
<merc:config id="conf">
<merc:repo id="localRepo" dir="${local.repo.dir}"/>
- <merc:repo id="central" url="http://repo1.maven.org/maven2"/>
+ <merc:repo id="central" url="http://localhost:${repo.port}/maven2"/>
</merc:config>
<merc:config id="config-bad-auth">
@@ -183,16 +183,21 @@
/>
</target>
- <target name="compile-thin-path" depends="init">
- <javac srcdir="${src}"
- destdir="${target}"
- source="${compiler.version}"
- target="${compiler.version}"
- >
+ <target name="compile-thin-path">
+
+ <taskdef resource="org/apache/maven/mercury/ant/tasks/antlib.xml"/>
+<!--
+ <repo id="central" url="http://localhost:${repo.port}/maven2"/>
+-->
+ <javac srcdir="${basedir}/src/test/compile"
+ destdir="${basedir}/target/compile-classes"
+ source="1.5"
+ target="1.5"
+ >
<classpath>
- <merc:dep>
- <merc:dependency name="asm:asm:3.0"/>
- </merc:dep>
+ <dep>
+ <dependency name="asm:asm:3.0"/>
+ </dep>
</classpath>
</javac>
</target>
Modified: maven/mercury/trunk/mercury-ant/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/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=730434&r1=730433&r2=730434&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java Wed Dec 31 09:54:19 2008
@@ -74,8 +74,9 @@
return;
setId(DEFAULT_CONFIG_ID);
-
- getProject().addReference( DEFAULT_CONFIG_ID, this );
+
+ if( getProject() != null )
+ getProject().addReference( DEFAULT_CONFIG_ID, this );
}
public Repo createRepo()
Modified: maven/mercury/trunk/mercury-ant/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/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml?rev=730434&r1=730433&r2=730434&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/resources/org/apache/maven/mercury/ant/tasks/antlib.xml Wed Dec 31 09:54:19 2008
@@ -8,6 +8,8 @@
<typedef name="deps" classname="org.apache.maven.mercury.ant.tasks.Dep"/>
<typedef name="repository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
<typedef name="config" classname="org.apache.maven.mercury.ant.tasks.Config"/>
+ <typedef name="repo" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
+ <typedef name="repository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
<!-- helper sytaxes -->
<typedef name="dep" classname="org.apache.maven.mercury.ant.tasks.Dep"/>
@@ -22,6 +24,7 @@
<taskdef name="dependencies" classname="org.apache.maven.mercury.ant.tasks.ResolveTask"/>
<typedef name="localRepository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
+ <typedef name="localRepository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
<typedef name="remoteRepository" classname="org.apache.maven.mercury.ant.tasks.Repo"/>
</antlib>
Modified: maven/mercury/trunk/mercury-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/pom.xml?rev=730434&r1=730433&r2=730434&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/pom.xml (original)
+++ maven/mercury/trunk/mercury-ant/pom.xml Wed Dec 31 09:54:19 2008
@@ -223,6 +223,7 @@
</dependencies>
</dependencyManagement>
+
<dependencies>
<!-- Test Dependencies -->
<dependency>