Author: cziegeler
Date: Mon Dec 10 07:48:10 2007
New Revision: 602944
URL: http://svn.apache.org/viewvc?rev=602944&view=rev
Log:
Fix bug in jspc mojo: source directory is now resolved correct if multi project
build is used.
Adding sample to root pom.
Modified:
incubator/sling/trunk/maven/maven-jspc-plugin/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
incubator/sling/trunk/pom.xml
Modified:
incubator/sling/trunk/maven/maven-jspc-plugin/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/maven/maven-jspc-plugin/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java?rev=602944&r1=602943&r2=602944&view=diff
==============================================================================
---
incubator/sling/trunk/maven/maven-jspc-plugin/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
(original)
+++
incubator/sling/trunk/maven/maven-jspc-plugin/src/main/java/org/apache/sling/maven/jspc/JspcMojo.java
Mon Dec 10 07:48:10 2007
@@ -80,7 +80,7 @@
* @parameter expression="${jspc.sourceDirectory}"
* default-value="${project.build.scriptSourceDirectory}"
*/
- private String sourceDirectory;
+ private File sourceDirectory;
/**
* Target folder for the compiled classes.
@@ -197,9 +197,9 @@
public void execute() throws MojoExecutionException {
try {
- uriSourceRoot = new File(sourceDirectory).getCanonicalPath();
+ uriSourceRoot = sourceDirectory.getCanonicalPath();
} catch (Exception e) {
- uriSourceRoot = new File(sourceDirectory).getAbsolutePath();
+ uriSourceRoot = sourceDirectory.getAbsolutePath();
}
// ensure output directory
@@ -283,7 +283,7 @@
// No explicit pages, we'll process all .jsp in the webapp
if (pages.size() == 0) {
- scanFiles(new File(sourceDirectory));
+ scanFiles(sourceDirectory);
}
File uriRootF = new File(uriSourceRoot);
Modified: incubator/sling/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=602944&r1=602943&r2=602944&view=diff
==============================================================================
--- incubator/sling/trunk/pom.xml (original)
+++ incubator/sling/trunk/pom.xml Mon Dec 10 07:48:10 2007
@@ -85,6 +85,7 @@
<module>sling/core</module>
<module>sling/event</module>
<module>sling/scheduler</module>
+ <module>sling/sample</module>
<!-- Scripting Support -->
<module>scripting/freemarker</module>
@@ -93,5 +94,10 @@
<module>scripting/jsp-taglib</module>
<module>scripting/ruby</module>
<module>scripting/velocity</module>
+
+ <!-- Microsling
+ <module>microsling/microsling-core</module>
+ <module>microsling/microsling-standalone</module>
+ -->
</modules>
</project>
