Author: mfortun Date: 2011-08-18 18:19:47 +0200 (Thu, 18 Aug 2011) New Revision: 1175 Url: http://nuiton.org/repositories/revision/wikitty/1175 Log: *work on deploy jar Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/DeployUtil.java Modified: trunk/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wp-maven-plugin/pom.xml trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 14:05:03 UTC (rev 1174) +++ trunk/pom.xml 2011-08-18 16:19:47 UTC (rev 1175) @@ -398,8 +398,8 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>${deployPluginVersion}</version> + <artifactId>maven-site-plugin</artifactId> + <version>${deploySiteVersion}</version> </dependency> <dependency> @@ -534,8 +534,8 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${dependencyPluginVersion}</version> + <artifactId>maven-site-plugin</artifactId> + <version>${sitePluginVersion}</version> </dependency> </dependencies> Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-18 14:05:03 UTC (rev 1174) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-18 16:19:47 UTC (rev 1175) @@ -4,6 +4,8 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Set; +import java.util.jar.JarFile; + import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -114,7 +116,7 @@ } - static public void externalize(ApplicationConfig conf, Criteria crit, File TargetDir, String jarName) + static public File externalize(ApplicationConfig conf, Criteria crit, File TargetDir, String jarName) throws ArgumentsParserException, IOException { CodeDecorator decorator = new CodeDecorator(); @@ -251,6 +253,8 @@ // delete tempfile FileUtil.deleteRecursively(tempDirectory); + + return jarFile; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-18 14:05:03 UTC (rev 1174) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-18 16:19:47 UTC (rev 1175) @@ -95,6 +95,8 @@ //found jar File[] jarFiles = jarLocation.listFiles(jarFilter); + // TODO mfortun-2011-08-18 BAD solution: need a notifier system + // to allow service to rebuild his index String sumMd5 = StringUtils.EMPTY; for (File jf : jarFiles){ sumMd5+=jf.getAbsolutePath(); Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2011-08-18 14:05:03 UTC (rev 1174) +++ trunk/wp-maven-plugin/pom.xml 2011-08-18 16:19:47 UTC (rev 1175) @@ -84,7 +84,7 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> + <artifactId>maven-site-plugin</artifactId> </dependency> Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/DeployUtil.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/DeployUtil.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/DeployUtil.java 2011-08-18 16:19:47 UTC (rev 1175) @@ -0,0 +1,811 @@ +package org.nuiton.wikitty.plugin; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; +import java.util.Locale; +import java.util.Set; + +import org.apache.maven.artifact.manager.WagonManager; +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.model.DistributionManagement; +import org.apache.maven.model.Site; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; + +import org.apache.maven.project.MavenProject; +import org.apache.maven.settings.Proxy; +import org.apache.maven.settings.Server; +import org.apache.maven.settings.Settings; +import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; +import org.apache.maven.settings.crypto.SettingsDecrypter; +import org.apache.maven.settings.crypto.SettingsDecryptionResult; +import org.apache.maven.wagon.CommandExecutionException; +import org.apache.maven.wagon.CommandExecutor; +import org.apache.maven.wagon.ConnectionException; +import org.apache.maven.wagon.ResourceDoesNotExistException; +import org.apache.maven.wagon.TransferFailedException; +import org.apache.maven.wagon.UnsupportedProtocolException; +import org.apache.maven.wagon.Wagon; +import org.apache.maven.wagon.authentication.AuthenticationException; +import org.apache.maven.wagon.authentication.AuthenticationInfo; +import org.apache.maven.wagon.authorization.AuthorizationException; +import org.apache.maven.wagon.observers.Debug; +import org.apache.maven.wagon.proxy.ProxyInfo; +import org.apache.maven.wagon.repository.Repository; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.component.configurator.ComponentConfigurationException; +import org.codehaus.plexus.component.configurator.ComponentConfigurator; +import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; +import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.codehaus.plexus.configuration.PlexusConfiguration; +import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; +import org.codehaus.plexus.context.Context; +import org.codehaus.plexus.context.ContextException; +import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.xml.Xpp3Dom; + + + +public class DeployUtil { + /* *//** + * Directory containing the generated project sites and report distributions. + * + * @parameter alias="outputDirectory" expression="${project.reporting.outputDirectory}" + * @required + *//* + private File inputDirectory; + + *//** + * Whether to run the "chmod" command on the remote site after the deploy. + * Defaults to "true". + * + * @parameter expression="${maven.site.chmod}" default-value="true" + * @since 2.1 + *//* + private boolean chmod; + + *//** + * The mode used by the "chmod" command. Only used if chmod = true. + * Defaults to "g+w,a+rX". + * + * @parameter expression="${maven.site.chmod.mode}" default-value="g+w,a+rX" + * @since 2.1 + *//* + private String chmodMode; + + *//** + * The options used by the "chmod" command. Only used if chmod = true. + * Defaults to "-Rf". + * + * @parameter expression="${maven.site.chmod.options}" default-value="-Rf" + * @since 2.1 + *//* + private String chmodOptions; + + *//** + * Set this to 'true' to skip site deployment. + * + * @parameter expression="${maven.site.deploy.skip}" default-value="false" + * @since 3.0 + *//* + private boolean skipDeploy; + + *//** + * @component + *//* + private WagonManager wagonManager; + + *//** + * The current user system settings for use in Maven. + * + * @parameter expression="${settings}" + * @required + * @readonly + *//* + private Settings settings; + + *//** + * @parameter expression="${session}" + * @required + * @readonly + * @since 3.0-beta-2 + *//* + protected MavenSession mavenSession; + + private PlexusContainer container; + + private String deployRepositoryID; + + private String deployRepositoryUrl; + + private Log log; + + *//** + * The String "staging/". + *//* + protected static final String DEFAULT_STAGING_DIRECTORY = "staging/"; + + *//** {@inheritDoc} *//* + public void execute() + throws MojoExecutionException + { + if ( skipDeploy ) + { + getLog().info( "maven.site.deploy.skip = true: Skipping site deployment" ); + return; + } + + deployTo( new org.apache.maven.plugins.site.wagon.repository.Repository( + getDeployRepositoryID(), + appendSlash( getDeployRepositoryURL() ) ) ); + } + + public Log getLog() { + return log; + + } + + *//** + * Make sure the given url ends with a slash. + * + * @param url a String. + * + * @return if url already ends with '/' it is returned unchanged, + * otherwise a '/' character is appended. + *//* + protected static String appendSlash( final String url ) + { + if ( url.endsWith( "/" ) ) + { + return url; + } + else + { + return url + "/"; + } + } + + *//** + * Specifies the id to look up credential settings. + * + * @return the id to look up credentials for the deploy. Not null. + * + * @throws MojoExecutionException + * if the ID cannot be determined + *//* + protected String getDeployRepositoryID() + throws MojoExecutionException{ + return deployRepositoryID; + } + + *//** + * Specifies the target URL for the deploy. + * This should be the top-level URL, ie above modules and locale sub-directories. + * + * @return the url to deploy to. Not null. + * + * @throws MojoExecutionException + * if the URL cannot be constructed + *//* + protected String getDeployRepositoryURL() + throws MojoExecutionException{ + return deployRepositoryUrl; + } + + *//** + * Find the relative path between the distribution URLs of the top parent and the current project. + * + * @return the relative path or "./" if the two URLs are the same. + * + * @throws MojoExecutionException + *//* + private String getDeployModuleDirectory() + throws MojoExecutionException + { + String relative = siteTool.getRelativePath( getSite( project ).getUrl(), + getRootSite( project ).getUrl() ); + + // SiteTool.getRelativePath() uses File.separatorChar, + // so we need to convert '\' to '/' in order for the URL to be valid for Windows users + relative = relative.replace( '\\', '/' ); + + return ( "".equals( relative ) ) ? "./" : relative; + } + + *//** + * Use wagon to deploy the generated site to a given repository. + * + * @param repository the repository to deply to. + * This needs to contain a valid, non-null {@link Repository#getId() id} + * to look up credentials for the deploy, and a valid, non-null + * {@link Repository#getUrl() scm url} to deploy to. + * + * @throws MojoExecutionException if the deploy fails. + *//* + private void deployTo( final Repository repository ) + throws MojoExecutionException + { + if ( !inputDirectory.exists() ) + { + throw new MojoExecutionException( "The site does not exist, please run site:site first" ); + } + + if ( getLog().isDebugEnabled() ) + { + getLog().debug( "Deploying to '" + repository.getUrl() + + "',\n Using credentials from server id '" + repository.getId() + "'" ); + } + + deploy( inputDirectory, repository ); + } + + private void deploy( final File directory, final Repository repository ) + throws MojoExecutionException + { + // TODO: work on moving this into the deployer like the other deploy methods + final Wagon wagon = getWagon( repository, wagonManager ); + + try + { + configureWagon( wagon, repository.getId(), settings, container, getLog() ); + } + catch ( TransferFailedException e ) + { + throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e ); + } + + try + { + final ProxyInfo proxyInfo; + if ( !isMaven3OrMore() ) + { + proxyInfo = getProxyInfo( repository, wagonManager ); + } + else + { + try + { + SettingsDecrypter settingsDecrypter = container.lookup( SettingsDecrypter.class ); + + proxyInfo = getProxy( repository, settingsDecrypter ); + } + catch ( ComponentLookupException cle ) + { + throw new MojoExecutionException( "Unable to lookup SettingsDecrypter: " + cle.getMessage(), cle ); + } + } + + push( directory, repository, wagon, proxyInfo, siteTool.getAvailableLocales( locales ), + getDeployModuleDirectory() ); + + if ( chmod ) + { + chmod( wagon, repository, chmodOptions, chmodMode ); + } + } + finally + { + try + { + wagon.disconnect(); + } + catch ( ConnectionException e ) + { + getLog().error( "Error disconnecting wagon - ignored", e ); + } + } + } + + *//** + * Find the build directory of the top level project in the reactor. + * If no top level project is found, the build directory of the current project is returned. + * + * @return the build directory of the top level project. + *//* + protected File getTopLevelBuildDirectory() + { + // Find the top level project in the reactor + final MavenProject topLevelProject = getTopLevelProject( reactorProjects ); + + // Use the top level project's build directory if there is one, otherwise use this project's build directory + final File buildDirectory; + + if ( topLevelProject == null ) + { + getLog().debug( "No top level project found in the reactor, using the current project." ); + + buildDirectory = new File( project.getBuild().getDirectory() ); + } + else + { + getLog().debug( "Using the top level project found in the reactor." ); + + buildDirectory = new File( topLevelProject.getBuild().getDirectory() ); + } + + return buildDirectory; + } + + private Wagon getWagon( final Repository repository, final WagonManager manager ) + throws MojoExecutionException + { + final Wagon wagon; + + try + { + wagon = manager.getWagon( repository ); + } + catch ( UnsupportedProtocolException e ) + { + String shortMessage = + "Unsupported protocol: '" + repository.getProtocol() + "' for site deployment to " + + "distributionManagement.site.url=" + repository.getUrl() + "."; + String longMessage = + "\n" + shortMessage + "\n" + + "Currently supported protocols are: " + getSupportedProtocols() + ".\n" + + " Protocols may be added through wagon providers.\n" + + " For more information, see " + + "http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-pro..."; + + getLog().error( longMessage ); + + throw new MojoExecutionException( shortMessage ); + } + catch ( TransferFailedException e ) + { + throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e ); + } + + if ( !wagon.supportsDirectoryCopy() ) + { + throw new MojoExecutionException( + "Wagon protocol '" + repository.getProtocol() + "' doesn't support directory copying" ); + } + + return wagon; + } + + private String getSupportedProtocols() + { + try + { + Set<String> protocols = container.lookupMap( Wagon.class ).keySet(); + + return StringUtils.join( protocols.iterator(), ", " ); + } + catch ( ComponentLookupException e ) + { + // in the unexpected case there is a problem when instantiating a wagon provider + getLog().error( e ); + } + return ""; + } + + private void push( final File inputDirectory, final Repository repository, final Wagon wagon, + final ProxyInfo proxyInfo, final List<Locale> localesList, final String relativeDir ) + throws MojoExecutionException + { + AuthenticationInfo authenticationInfo = wagonManager.getAuthenticationInfo( repository.getId() ); + getLog().debug( "authenticationInfo with id '" + repository.getId() + "': " + + ( ( authenticationInfo == null ) ? "-" : authenticationInfo.getUserName() ) ); + + try + { + Debug debug = new Debug(); + + wagon.addSessionListener( debug ); + + wagon.addTransferListener( debug ); + + if ( proxyInfo != null ) + { + getLog().debug( "connect with proxyInfo" ); + wagon.connect( repository, authenticationInfo, proxyInfo ); + } + else if ( proxyInfo == null && authenticationInfo != null ) + { + getLog().debug( "connect with authenticationInfo and without proxyInfo" ); + wagon.connect( repository, authenticationInfo ); + } + else + { + getLog().debug( "connect without authenticationInfo and without proxyInfo" ); + wagon.connect( repository ); + } + + getLog().info( "Pushing " + inputDirectory ); + + // Default is first in the list + final String defaultLocale = localesList.get( 0 ).getLanguage(); + + for ( Locale locale : localesList ) + { + if ( locale.getLanguage().equals( defaultLocale ) ) + { + // TODO: this also uploads the non-default locales, + // is there a way to exclude directories in wagon? + getLog().info( " >>> to " + repository.getUrl() + relativeDir ); + + wagon.putDirectory( inputDirectory, relativeDir ); + } + else + { + getLog().info( " >>> to " + repository.getUrl() + locale.getLanguage() + "/" + relativeDir ); + + wagon.putDirectory( new File( inputDirectory, locale.getLanguage() ), + locale.getLanguage() + "/" + relativeDir ); + } + } + } + catch ( ResourceDoesNotExistException e ) + { + throw new MojoExecutionException( "Error uploading site", e ); + } + catch ( TransferFailedException e ) + { + throw new MojoExecutionException( "Error uploading site", e ); + } + catch ( AuthorizationException e ) + { + throw new MojoExecutionException( "Error uploading site", e ); + } + catch ( ConnectionException e ) + { + throw new MojoExecutionException( "Error uploading site", e ); + } + catch ( AuthenticationException e ) + { + throw new MojoExecutionException( "Error uploading site", e ); + } + } + + private static void chmod( final Wagon wagon, final Repository repository, final String chmodOptions, + final String chmodMode ) + throws MojoExecutionException + { + try + { + if ( wagon instanceof CommandExecutor ) + { + CommandExecutor exec = (CommandExecutor) wagon; + exec.executeCommand( "chmod " + chmodOptions + " " + chmodMode + " " + repository.getBasedir() ); + } + // else ? silently ignore, FileWagon is not a CommandExecutor! + } + catch ( CommandExecutionException e ) + { + throw new MojoExecutionException( "Error uploading site", e ); + } + } + + *//** + * <p> + * Get the <code>ProxyInfo</code> of the proxy associated with the <code>host</code> + * and the <code>protocol</code> of the given <code>repository</code>. + * </p> + * <p> + * Extract from <a href="http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html"> + * J2SE Doc : Networking Properties - nonProxyHosts</a> : "The value can be a list of hosts, + * each separated by a |, and in addition a wildcard character (*) can be used for matching" + * </p> + * <p> + * Defensively support for comma (",") and semi colon (";") in addition to pipe ("|") as separator. + * </p> + * + * @param repository the Repository to extract the ProxyInfo from. + * @param wagonManager the WagonManager used to connect to the Repository. + * @return a ProxyInfo object instantiated or <code>null</code> if no matching proxy is found + *//* + public static ProxyInfo getProxyInfo( Repository repository, WagonManager wagonManager ) + { + ProxyInfo proxyInfo = wagonManager.getProxy( repository.getProtocol() ); + + if ( proxyInfo == null ) + { + return null; + } + + String host = repository.getHost(); + String nonProxyHostsAsString = proxyInfo.getNonProxyHosts(); + String[] nonProxyHosts = StringUtils.split( nonProxyHostsAsString, ",;|" ); + for ( int i = 0; i < nonProxyHosts.length; i++ ) + { + String nonProxyHost = nonProxyHosts[i]; + if ( StringUtils.contains( nonProxyHost, "*" ) ) + { + // Handle wildcard at the end, beginning or middle of the nonProxyHost + final int pos = nonProxyHost.indexOf( '*' ); + String nonProxyHostPrefix = nonProxyHost.substring( 0, pos ); + String nonProxyHostSuffix = nonProxyHost.substring( pos + 1 ); + // prefix* + if ( StringUtils.isNotEmpty( nonProxyHostPrefix ) && host.startsWith( nonProxyHostPrefix ) + && StringUtils.isEmpty( nonProxyHostSuffix ) ) + { + return null; + } + // *suffix + if ( StringUtils.isEmpty( nonProxyHostPrefix ) + && StringUtils.isNotEmpty( nonProxyHostSuffix ) && host.endsWith( nonProxyHostSuffix ) ) + { + return null; + } + // prefix*suffix + if ( StringUtils.isNotEmpty( nonProxyHostPrefix ) && host.startsWith( nonProxyHostPrefix ) + && StringUtils.isNotEmpty( nonProxyHostSuffix ) && host.endsWith( nonProxyHostSuffix ) ) + { + return null; + } + } + else if ( host.equals( nonProxyHost ) ) + { + return null; + } + } + return proxyInfo; + } + + *//** + * Get proxy information for Maven 3. + * + * @param repository + * @param log + * @param mavenSession + * @param settingsDecrypter + * @return + *//* + private ProxyInfo getProxy( Repository repository, SettingsDecrypter settingsDecrypter ) + { + String protocol = repository.getProtocol(); + String url = repository.getUrl(); + + getLog().debug( "repository protocol " + protocol ); + + String originalProtocol = protocol; + // olamy: hackish here protocol (wagon hint in fact !) is dav + // but the real protocol (transport layer) is http(s) + // and it's the one use in wagon to find the proxy arghhh + // so we will check both + if ( StringUtils.equalsIgnoreCase( "dav", protocol ) && url.startsWith( "dav:" ) ) + { + url = url.substring( 4 ); + if ( url.startsWith( "http" ) ) + { + try + { + URL urlSite = new URL( url ); + protocol = urlSite.getProtocol(); + getLog().debug( "found dav protocol so transform to real transport protocol " + protocol ); + } + catch ( MalformedURLException e ) + { + getLog().warn( "fail to build URL with " + url ); + } + + } + } + else + { + getLog().debug( "getProxy 'protocol': " + protocol ); + } + if ( mavenSession != null && protocol != null ) + { + MavenExecutionRequest request = mavenSession.getRequest(); + + if ( request != null ) + { + List<Proxy> proxies = request.getProxies(); + + if ( proxies != null ) + { + for ( Proxy proxy : proxies ) + { + if ( proxy.isActive() + && ( protocol.equalsIgnoreCase( proxy.getProtocol() ) || originalProtocol + .equalsIgnoreCase( proxy.getProtocol() ) ) ) + { + SettingsDecryptionResult result = settingsDecrypter + .decrypt( new DefaultSettingsDecryptionRequest( proxy ) ); + proxy = result.getProxy(); + + ProxyInfo proxyInfo = new ProxyInfo(); + proxyInfo.setHost( proxy.getHost() ); + // so hackish for wagon the protocol is https for site dav : dav:https://dav.codehaus.org/mojo/ + proxyInfo.setType( protocol );//proxy.getProtocol() ); + proxyInfo.setPort( proxy.getPort() ); + proxyInfo.setNonProxyHosts( proxy.getNonProxyHosts() ); + proxyInfo.setUserName( proxy.getUsername() ); + proxyInfo.setPassword( proxy.getPassword() ); + + getLog().debug( "found proxyInfo " + + ( proxyInfo == null ? "null" : "host:port " + proxyInfo.getHost() + + ":" + proxyInfo.getPort() + ", " + proxyInfo.getUserName() ) ); + + return proxyInfo; + } + } + } + } + } + getLog().debug( "getProxy 'protocol': " + protocol + " no ProxyInfo found"); + return null; + } + + *//** + * Configure the Wagon with the information from serverConfigurationMap ( which comes from settings.xml ) + * + * @todo Remove when {@link WagonManager#getWagon(Repository) is available}. It's available in Maven 2.0.5. + * @param wagon + * @param repositoryId + * @param settings + * @param container + * @param log + * @throws WagonConfigurationException + *//* + private static void configureWagon( Wagon wagon, String repositoryId, Settings settings, PlexusContainer container, + Log log ) + throws TransferFailedException + { + log.debug( " configureWagon " ); + + // MSITE-25: Make sure that the server settings are inserted + for ( int i = 0; i < settings.getServers().size(); i++ ) + { + Server server = settings.getServers().get( i ); + String id = server.getId(); + + log.debug( "configureWagon server " + id ); + + if ( id != null && id.equals( repositoryId ) ) + { + if ( server.getConfiguration() != null ) + { + final PlexusConfiguration plexusConf = + new XmlPlexusConfiguration( (Xpp3Dom) server.getConfiguration() ); + + ComponentConfigurator componentConfigurator = null; + try + { + componentConfigurator = (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, "basic" ); + componentConfigurator.configureComponent( wagon, plexusConf, container.getContainerRealm() ); + } + catch ( final ComponentLookupException e ) + { + throw new TransferFailedException( "While configuring wagon for \'" + repositoryId + + "\': Unable to lookup wagon configurator." + " Wagon configuration cannot be applied.", e ); + } + catch ( ComponentConfigurationException e ) + { + throw new TransferFailedException( "While configuring wagon for \'" + repositoryId + + "\': Unable to apply wagon configuration.", e ); + } + finally + { + if ( componentConfigurator != null ) + { + try + { + container.release( componentConfigurator ); + } + catch ( ComponentLifecycleException e ) + { + log.error( "Problem releasing configurator - ignoring: " + e.getMessage() ); + } + } + } + } + } + } + } + + *//** {@inheritDoc} *//* + public void contextualize( Context context ) + throws ContextException + { + container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY ); + } + + *//** + * Find the top level parent in the reactor, i.e. the execution root. + * + * @param reactorProjects The projects in the reactor. May be null in which case null is returned. + * + * @return The top level project in the reactor, or <code>null</code> if none can be found + *//* + private static MavenProject getTopLevelProject( List<MavenProject> reactorProjects ) + { + if ( reactorProjects == null ) + { + return null; + } + + for ( MavenProject reactorProject : reactorProjects ) + { + if ( reactorProject.isExecutionRoot() ) + { + return reactorProject; + } + } + + return null; + } + + *//** + * Extract the distributionManagment site from the given MavenProject. + * + * @param project the MavenProject. Not null. + * + * @return the project site. Not null. + * Also site.getUrl() and site.getId() are guaranteed to be not null. + * + * @throws MojoExecutionException if any of the site info is missing. + *//* + protected static Site getSite( final MavenProject project ) + throws MojoExecutionException + { + final String name = project.getName() + " (" + + project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion() + ")"; + + final DistributionManagement distributionManagement = project.getDistributionManagement(); + + if ( distributionManagement == null ) + { + throw new MojoExecutionException( "Missing distribution management in project " + name ); + } + + final Site site = distributionManagement.getSite(); + + if ( site == null ) + { + throw new MojoExecutionException( + "Missing site information in the distribution management of the project " + name ); + } + + if ( site.getUrl() == null || site.getId() == null ) + { + throw new MojoExecutionException( "Missing site data: specify url and id for project " + name ); + } + + return site; + } + + *//** + * Extract the distributionManagment site of the top level parent of the given MavenProject. + * This climbs up the project hierarchy and returns the site of the last project + * for which {@link #getSite(org.apache.maven.project.MavenProject)} returns a site. + * + * @param project the MavenProject. Not null. + * + * @return the top level site. Not null. + * Also site.getUrl() and site.getId() are guaranteed to be not null. + * + * @throws MojoExecutionException if no site info is found in the tree. + *//* + protected Site getRootSite( MavenProject project ) + throws MojoExecutionException + { + Site site = getSite( project ); + + MavenProject parent = project; + + while ( parent.getParent() != null ) + { + // MSITE-585, MNG-1943 + parent = siteTool.getParentProject( parent, reactorProjects, localRepository ); + + try + { + site = getSite( parent ); + } + catch ( MojoExecutionException e ) + { + break; + } + } + + return site; + }*/ +} Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java 2011-08-18 14:05:03 UTC (rev 1174) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java 2011-08-18 16:19:47 UTC (rev 1175) @@ -24,6 +24,37 @@ */ package org.nuiton.wikitty.plugin; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; + +import org.apache.maven.artifact.manager.WagonManager; +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.site.AbstractSiteMojo; +import org.apache.maven.plugins.site.SiteDeployMojo; +import org.apache.maven.plugins.site.SiteMojo; +import org.apache.maven.settings.Proxy; +import org.apache.maven.settings.Settings; +import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; +import org.apache.maven.settings.crypto.SettingsDecrypter; +import org.apache.maven.settings.crypto.SettingsDecryptionResult; +import org.apache.maven.wagon.ConnectionException; +import org.apache.maven.wagon.TransferFailedException; +import org.apache.maven.wagon.UnsupportedProtocolException; +import org.apache.maven.wagon.Wagon; +import org.apache.maven.wagon.proxy.ProxyInfo; +import org.apache.maven.wagon.repository.Repository; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.codehaus.plexus.context.Context; +import org.codehaus.plexus.context.ContextException; +import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; +import org.codehaus.plexus.util.StringUtils; + + /** * To deploy a wikitty publication jar. * @@ -35,8 +66,28 @@ * @requiresDependencyResolution runtime * @since 3.2 */ -public class WPDeployJarMojo extends AbstractWPMojo { +public class WPDeployJarMojo extends AbstractWPMojo implements Contextualizable { + protected String uploadUrl; + protected String serveurID; + + /** + * @component + */ + private WagonManager wagonManager; + /** + * The current user system settings for use in Maven. + * + * @parameter expression="${settings}" + * @required + * @readonly + */ + private Settings settings; + + + private PlexusContainer container; + + @Override protected void init() throws Exception { //TODO @@ -44,9 +95,31 @@ @Override protected void doAction() throws Exception { + + DeployUtil deploy = new DeployUtil(); + - //TODO + String file = getProject().getBuild().getDirectory(); + file+=File.separator+WPJarMojo.EXTERNALIZE_PREFIX+applicationName+".jar"; + File jarFile= new File(file); + + // SiteDeployMojo + + + /* + + deploy.setFile(jarFile); + deploy.setUrl("localhost:7878"); + deploy.setRepositoryId("bob"); + + + + + + + deploy.execute();*/ } + }