You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by ma...@apache.org on 2007/05/13 14:37:29 UTC
svn commit: r537588 - in /incubator/ivy/core/trunk: ant.patterns build.xml
optional.patterns
Author: maartenc
Date: Sun May 13 07:37:28 2007
New Revision: 537588
URL: http://svn.apache.org/viewvc?view=rev&rev=537588
Log:
Fixed NPE during Ivy build.
Modified:
incubator/ivy/core/trunk/ant.patterns
incubator/ivy/core/trunk/build.xml
incubator/ivy/core/trunk/optional.patterns
Modified: incubator/ivy/core/trunk/ant.patterns
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/ant.patterns?view=diff&rev=537588&r1=537587&r2=537588
==============================================================================
--- incubator/ivy/core/trunk/ant.patterns (original)
+++ incubator/ivy/core/trunk/ant.patterns Sun May 13 07:37:28 2007
@@ -1,2 +1,5 @@
-#This file defines the sources to compile for ivy-ant.jar
-org/apache/ivy/ant/**/*.java
\ No newline at end of file
+#This section defines the sources to compile for ivy-ant.jar
+org/apache/ivy/ant/*.java
+
+#This section defines the resources to copy for ivy-ant.jar
+org/apache/ivy/ant/*.xml
\ No newline at end of file
Modified: incubator/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=537588&r1=537587&r2=537588
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Sun May 13 07:37:28 2007
@@ -163,8 +163,9 @@
</javac>
<copy todir="${core.classes.build.dir}" includeEmptyDirs="false">
<fileset dir="${src.dir}">
- <include name="org/apache/ivy/core/**" />
<exclude name="**/*.java"/>
+ <excludesfile name="ant.patterns" />
+ <excludesfile name="optional.patterns" />
</fileset>
</copy>
@@ -198,7 +199,7 @@
</javac>
<copy todir="${ant.classes.build.dir}" includeEmptyDirs="false">
<fileset dir="${src.dir}">
- <include name="org/apache/ivy/ant/**" />
+ <includesfile name="ant.patterns" />
<exclude name="**/*.java"/>
</fileset>
</copy>
@@ -226,8 +227,7 @@
</javac>
<copy todir="${core.classes.build.dir}" includeEmptyDirs="false">
<fileset dir="${src.dir}">
- <exclude name="org/apache/ivy/core/**" />
- <exclude name="org/apache/ivy/ant/**" />
+ <includesfile name="optional.patterns" />
<exclude name="**/*.java"/>
</fileset>
</copy>
Modified: incubator/ivy/core/trunk/optional.patterns
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/optional.patterns?view=diff&rev=537588&r1=537587&r2=537588
==============================================================================
--- incubator/ivy/core/trunk/optional.patterns (original)
+++ incubator/ivy/core/trunk/optional.patterns Sun May 13 07:37:28 2007
@@ -10,4 +10,7 @@
org/apache/ivy/plugins/resolver/SshResolver.java
org/apache/ivy/plugins/resolver/VfsResolver.java
org/apache/ivy/plugins/resolver/VsftpResolver.java
-org/apache/ivy/util/url/HttpClientHandler.java
\ No newline at end of file
+org/apache/ivy/util/url/HttpClientHandler.java
+
+#This section defines the resources to copy for ivy-optional.jar
+org/apache/ivy/plugins/repository/vfs/*.xml
\ No newline at end of file