Author: justin
Date: Tue Aug 24 18:07:45 2010
New Revision: 988642
URL: http://svn.apache.org/viewvc?rev=988642&view=rev
Log:
SLING-1693 - implemeting a search path for resources
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
Modified:
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java?rev=988642&r1=988641&r2=988642&view=diff
==============================================================================
---
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
(original)
+++
sling/trunk/maven/maven-launchpad-plugin/src/main/java/org/apache/sling/maven/projectsupport/AbstractLaunchpadStartingMojo.java
Tue Aug 24 18:07:45 2010
@@ -100,6 +100,12 @@ public abstract class AbstractLaunchpadS
private File propertiesFile;
/**
+ * @parameter expression="${resourceProviderRoot}"
+ * default-value="src/test/resources"
+ */
+ private File resourceProviderRoot;
+
+ /**
* @component
*/
private MavenFileFilter mavenFileFilter;
@@ -155,13 +161,23 @@ public abstract class AbstractLaunchpadS
@Override
public URL getResource(String path) {
- if (path.endsWith(".properties") || path.endsWith(".xml")) {
- return getClass().getResource("/" + path);
+ File resourceFile = new File(resourceProviderRoot, path);
+ if (resourceFile.exists()) {
+ try {
+ return resourceFile.toURI().toURL();
+ } catch (MalformedURLException e) {
+ getLog().error("Unable to create URL for file", e);
+ return null;
+ }
} else {
+ URL fromClasspath = getClass().getResource("/" + path);
+ if (fromClasspath != null) {
+ return fromClasspath;
+ }
+
try {
return new URL(path);
} catch (MalformedURLException e) {
- getLog().error("Expecting a real URL", e);
return null;
}
}