[NPANDAY-467] locate resx files in the current directory
This was the intended behaviour, but an incorrect condition on the
embeddedResources field was preventing it.
Submitted by: Anthony Whitford
git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1619647 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java b/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java
index cbec840..07dfaac 100644
--- a/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java
+++ b/plugins/maven-resgen-plugin/src/main/java/npanday/plugin/resgen/ExistingResxGenerator.java
@@ -131,7 +131,10 @@
for (EmbeddedResource embeddedResource : embeddedResources)
{
File file = new File(project.getBuild().getSourceDirectory() + File.separator + embeddedResource.getSourceFile());
- if(!file.exists()) continue;
+ if (!file.exists()) {
+ getLog().warn("embeddedResource does not exist: " + embeddedResource.getSourceFile());
+ continue;
+ }
commands = getCommands(file.getAbsoluteFile(), resourceDirectory, embeddedResource.getName());
netExecutableFactory.getExecutable(
new ExecutableRequirement( vendor, null, frameworkVersion, "RESGEN" ), commands, netHome
@@ -139,15 +142,15 @@
.execute();
}
- if(embeddedResources == null)
+ if(embeddedResources.length == 0)
{
String sourceDirectory = project.getBasedir().getPath();
String[] resourceFilenames = FileUtils.getFilesFromExtension(sourceDirectory, new String[]{"resx"});
for(String resourceFilename : resourceFilenames)
{
+ getLog().debug("processing " + resourceFilename);
File file = new File(resourceFilename);
- if(!file.exists()) continue;
String name = resourceFilename.substring(sourceDirectory.length() + 1).replace('\\', '.');
name = project.getArtifactId() + "." + name.substring(0, name.lastIndexOf('.'));
diff --git a/pom.xml b/pom.xml
index e5dd9fa..190c2e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,6 +311,9 @@
<contributor>
<name>David Akehurst</name>
</contributor>
+ <contributor>
+ <name>Anthony Whitford</name>
+ </contributor>
</contributors>
<modules>
<module>components</module>
