Author: mfortun Date: 2011-08-18 12:05:22 +0200 (Thu, 18 Aug 2011) New Revision: 1171 Url: http://nuiton.org/repositories/revision/wikitty/1171 Log: *correct run goal, still need to load the war in a dynamic way Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java 2011-08-18 06:40:12 UTC (rev 1170) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java 2011-08-18 10:05:22 UTC (rev 1171) @@ -6,6 +6,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; import org.eclipse.jetty.util.Scanner; import org.eclipse.jetty.xml.XmlConfiguration; import org.mortbay.jetty.plugin.AbstractJettyMojo; @@ -155,7 +156,9 @@ } } - + - + public void setProject(MavenProject project) { + this.project = project; + } } Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-18 06:40:12 UTC (rev 1170) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-18 10:05:22 UTC (rev 1171) @@ -25,13 +25,16 @@ package org.nuiton.wikitty.plugin; import java.io.File; +import java.net.URL; import org.apache.maven.plugin.dependency.CopyDependenciesMojo; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.publication.PropertiesExtended; import org.nuiton.wikitty.publication.WikittyFileUtil; import org.nuiton.wikitty.publication.WikittyPublicationConstant; import org.nuiton.wikitty.publication.WikittyPublicationFallbackService; +import org.nuiton.wikitty.publication.externalize.WikittyPublicationClassLoader; import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; /** @@ -59,13 +62,15 @@ // TODO mfortun-2011-08-17 need to use copyDepencies Mojo to find // the wikittyPublication war - File webApp = new File ("/home/Manou/workspaceStage/wikitty/wikitty-publication-ui/target/wikitty-publication-ui-3.2-SNAPSHOT.war"); - - //CopyDependenciesMojo findWar = new CopyDependenciesMojo(); - + File webApp = new File( + "/home/Manou/workspaceStage/wikitty/wikitty-publication-ui/target/wikitty-publication-ui-3.2-SNAPSHOT.war"); + + // CopyDependenciesMojo findWar = new CopyDependenciesMojo(); + System.out.println(webApp); String build = project.getBuild().getDirectory(); - createDirectoryIfNecessary(new File(build)); + File buildDir = new File(build); + createDirectoryIfNecessary(buildDir); File propsFile = new File(build + File.separator + FALLBACK_PROPERTIE_FILE_NAME); @@ -76,11 +81,11 @@ // construct propertie for fallback service String fileSystemUrlService = getProject().getBasedir().toURI().toURL() .toExternalForm(); + fileSystemUrlService += WikittyPublicationConstant.LABEL_DELIM + SRC_DIR_NAME + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; - PropertiesExtended propsFSServiceFall = new PropertiesExtended( propsFile); @@ -92,13 +97,17 @@ propsFSServiceFall.store(); // set the propertie to find our propertieFile - //TODO mfortun-2011-08-17 need to put the complete path to the file ? + // TODO mfortun-2011-08-17 need to put the complete path to the file ? System.setProperty( WikittyPublicationFallbackService.WIKITTY_FALLBACK_FILE_KEY, FALLBACK_PROPERTIE_FILE_NAME); - + // use to specify were to found our properties file + System.setProperty(ApplicationConfig.CONFIG_PATH, getProject() + .getBuild().getDirectory()); + JettyUtil jettyRunMojo = new JettyUtil(); jettyRunMojo.setWebApp(webApp); + jettyRunMojo.setProject(project); jettyRunMojo.execute(); }