You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/10/27 02:22:40 UTC
svn commit: r588816 -
/incubator/tuscany/java/sca/modules/maven-ant-generator/src/main/java/org/apache/tuscany/tools/ant/generator/plugin/AntGeneratorMojo.java
Author: jsdelfino
Date: Fri Oct 26 17:22:38 2007
New Revision: 588816
URL: http://svn.apache.org/viewvc?rev=588816&view=rev
Log:
Supports projects with multiple source directories or source directories different than src/main/java
Modified:
incubator/tuscany/java/sca/modules/maven-ant-generator/src/main/java/org/apache/tuscany/tools/ant/generator/plugin/AntGeneratorMojo.java
Modified: incubator/tuscany/java/sca/modules/maven-ant-generator/src/main/java/org/apache/tuscany/tools/ant/generator/plugin/AntGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/maven-ant-generator/src/main/java/org/apache/tuscany/tools/ant/generator/plugin/AntGeneratorMojo.java?rev=588816&r1=588815&r2=588816&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/maven-ant-generator/src/main/java/org/apache/tuscany/tools/ant/generator/plugin/AntGeneratorMojo.java (original)
+++ incubator/tuscany/java/sca/modules/maven-ant-generator/src/main/java/org/apache/tuscany/tools/ant/generator/plugin/AntGeneratorMojo.java Fri Oct 26 17:22:38 2007
@@ -29,6 +29,8 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.FileSet;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -115,6 +117,10 @@
// Determine the project packaging
String packaging = project.getPackaging().toLowerCase();
+
+ for (Object resource: project.getResources()) {
+ System.out.println("Resource: " + resource);
+ }
// Determine the module dependencies
List<Artifact> tuscanyModules = new ArrayList<Artifact>();
@@ -131,15 +137,37 @@
pw.println();
// Generate the compile target
+ int base = project.getBasedir().toString().length() + 1;
pw.println(" <target name=\"compile\">");
- pw.println(" <javac srcdir=\"src/main/java\" destdir=\"target/classes\" debug=\"on\" source=\"1.5\" target=\"1.5\">");
+ pw.println(" <mkdir dir=\"target/classes\"/>");
+ pw.println(" <javac destdir=\"target/classes\" debug=\"on\" source=\"1.5\" target=\"1.5\">");
+ for (String source: (List<String>)project.getCompileSourceRoots()) {
+ if (source.length() > base) {
+ source = source.substring(base);
+ } else {
+ source = ".";
+ }
+ pw.println(" <src path=\"" + source + "\"/>");
+ }
pw.println(" <classpath>");
pw.println(" <fileset refid=\"tuscany.jars\"/>");
pw.println(" <fileset refid=\"3rdparty.jars\"/>");
pw.println(" </classpath>");
pw.println(" </javac>");
pw.println(" <copy todir=\"target/classes\">");
- pw.println(" <fileset dir=\"src/main/resources\"/>");
+ for (FileSet resource: (List<FileSet>)project.getResources()) {
+ String source = resource.getDirectory();
+ if (source.length() > base) {
+ source = source.substring(base);
+ pw.println(" <fileset dir=\"" + source + "\"/>");
+ } else {
+ if (project.getResources().size() > 1) {
+ break;
+ }
+ pw.println(" <fileset dir=\".\" excludes=\"**/*.java, pom.xml, build.xml, target\"/>");
+ source = ".";
+ }
+ }
pw.println(" </copy>");
// Build a JAR
@@ -181,7 +209,7 @@
// Generate the clean target
pw.println(" <target name=\"clean\">");
- pw.println(" <delete quiet=\"true\" includeemptydirs=\"true\">");
+ pw.println(" <delete includeemptydirs=\"true\">");
pw.println(" <fileset dir=\"target\"/>");
pw.println(" </delete>");
pw.println(" </target>");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org