incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1364989 - in /incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks: AbstractImport.java ImportTestModule.java
Date Tue, 24 Jul 2012 11:46:19 GMT
Author: jlboudart
Date: Tue Jul 24 11:46:19 2012
New Revision: 1364989

URL: http://svn.apache.org/viewvc?rev=1364989&view=rev
Log:
Removes check on artifact extension, this will allow to load plugins written with alternative
languages ;)

Modified:
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportTestModule.java

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java?rev=1364989&r1=1364988&r2=1364989&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
Tue Jul 24 11:46:19 2012
@@ -58,7 +58,7 @@ public abstract class AbstractImport ext
         for (int j = 0; j < report.getConfigurationReport(mainConf).getAllArtifactsReports().length;
j++) {
             ArtifactDownloadReport artifact = report.getConfigurationReport(mainConf).getAllArtifactsReports()[j];
 
-            if ("ant".equals(artifact.getType()) && "ant".equals(artifact.getExt()))
{
+            if ("ant".equals(artifact.getType())) {
                 antFile = artifact.getLocalFile();
             } else if ("jar".equals(artifact.getType())) {
                 path.createPathElement().setLocation(artifact.getLocalFile());

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportTestModule.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportTestModule.java?rev=1364989&r1=1364988&r2=1364989&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportTestModule.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportTestModule.java
Tue Jul 24 11:46:19 2012
@@ -73,7 +73,7 @@ public class ImportTestModule extends Ab
         for (int i = 0; i < report.getModuleDescriptor().getAllArtifacts().length; i++)
{
             Artifact artifact = report.getModuleDescriptor().getAllArtifacts()[i];
             File localResourceFile = new File(sourceDirectory, artifact.getName() + "." +
artifact.getExt());
-            if ("ant".equals(artifact.getType()) && "ant".equals(artifact.getExt()))
{
+            if ("ant".equals(artifact.getType())) {
                 antFile = localResourceFile;
             } else {
                 handleOtherResourceFile(moduleRevisionId,artifact.getName(),artifact.getExt(),
localResourceFile);



Mime
View raw message