Author: mfortun Date: 2011-08-17 18:34:19 +0200 (Wed, 17 Aug 2011) New Revision: 1169 Url: http://nuiton.org/repositories/revision/wikitty/1169 Log: *correct plugins, wp:run need to be corect invocation of jetty:run don't work Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.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/WPJarMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java 2011-08-17 15:09:44 UTC (rev 1168) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java 2011-08-17 16:34:19 UTC (rev 1169) @@ -49,6 +49,8 @@ */ public class WPJarMojo extends AbstractWPMojo { + static public String EXTERNALIZE_PREFIX = "externalize-"; + @Override protected void init() throws Exception { // TODO @@ -60,18 +62,29 @@ // to made a well formed jar we need to synchronise first // with this we will obtain the same directory/label configuration // that we will have on a classic service + + String origin = getProject().getBasedir().toURI().toURL() .toExternalForm(); - String target = origin; origin += WikittyPublicationConstant.LABEL_DELIM + SRC_DIR_NAME + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; - target += getProject().getBuild().getDirectory(); - createDirectoryIfNecessary(new File(target)); + String buildDir = getProject().getBuild().getDirectory(); + File targetFile = new File(buildDir); + createDirectoryIfNecessary(targetFile); + + String appPath = WikittyFileUtil.labelToPath(applicationName); + File appsDir = new File(buildDir+File.separator+appPath); + + createDirectoryIfNecessary(appsDir); + + String target = targetFile.toURI().toURL().toExternalForm(); target += WikittyPublicationConstant.LABEL_DELIM + applicationName; - + + + WikittyPublicationSynchronize.synchronisationServices(origin, target, true, false, false); @@ -88,9 +101,11 @@ Criteria critOnWikittyWithLabel = Search.query().keyword("*") .criteria(); + + String jarName = EXTERNALIZE_PREFIX+applicationName; WikittyPublicationExternalize.externalize(appconfig, - critOnWikittyWithLabel); + critOnWikittyWithLabel,targetFile, jarName); } 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-17 15:09:44 UTC (rev 1168) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-17 16:34:19 UTC (rev 1169) @@ -59,10 +59,11 @@ // TODO mfortun-2011-08-17 need to use copyDepencies Mojo to find // the wikittyPublication war - File webApp = null; + File webApp = new File ("/home/Manou/workspaceStage/wikitty/wikitty-publication-ui/target/wikitty-publication-ui-3.2-SNAPSHOT.war"); - //CopyDependenciesMojo - + //CopyDependenciesMojo findWar = new CopyDependenciesMojo(); + + System.out.println(webApp); String build = project.getBuild().getDirectory(); createDirectoryIfNecessary(new File(build)); @@ -95,9 +96,10 @@ System.setProperty( WikittyPublicationFallbackService.WIKITTY_FALLBACK_FILE_KEY, FALLBACK_PROPERTIE_FILE_NAME); - + JettyUtil jettyRunMojo = new JettyUtil(); jettyRunMojo.setWebApp(webApp); + jettyRunMojo.execute(); }