Author: chatellier Date: 2008-11-19 09:26:58 +0000 (Wed, 19 Nov 2008) New Revision: 1600 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Update pom, remove tools.jar Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-11-19 09:26:14 UTC (rev 1599) +++ isis-fish/trunk/pom.xml 2008-11-19 09:26:58 UTC (rev 1600) @@ -442,12 +442,12 @@ </dependency> <!-- fin svnkit pour communication subversion --> - <dependency> + <!--<dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> <version>1.6.0</version> <scope>compile</scope> - </dependency> + </dependency>--> </dependencies> @@ -637,6 +637,7 @@ </configuration> <executions> <execution> + <phase>generate-resources</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -648,9 +649,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> </plugin> <plugin> @@ -677,20 +687,17 @@ <phase>package</phase> <configuration> <tasks> - <copy - file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" - todir="${project.basedir}/target/resources/jnlp/"> + <copy file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" + todir="${project.basedir}/target/resources/jnlp/"> <filterset> <filter token="mail" value="mail-1.4.jar"/> <filter token="activation" value="activation-1.1.jar"/> </filterset> </copy> - <copy - file="${project.build.directory}/lib/mail-1.4.jar" - todir="${project.basedir}/target/resources/jnlp/"/> - <copy - file="${project.build.directory}/lib/activation-1.1.jar" - todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/mail-1.4.jar" + todir="${project.basedir}/target/resources/jnlp/"/> + <copy file="${project.build.directory}/lib/activation-1.1.jar" + todir="${project.basedir}/target/resources/jnlp/"/> </tasks> </configuration> <goals> @@ -769,8 +776,6 @@ </configuration> </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -790,7 +795,6 @@ </executions> </plugin> - </plugins> </build> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2008-11-19 09:26:14 UTC (rev 1599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2008-11-19 09:26:58 UTC (rev 1600) @@ -48,14 +48,13 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; -import com.sun.tools.javac.api.JavacTool; - import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.JavaSourceStorage; @@ -194,7 +193,9 @@ int result = -1000; try { - JavaCompiler compiler = JavacTool.create(); + //JavaCompiler compiler = JavacTool.create(); + // Use system compiler + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null); Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(src);