michal 2003/06/19 15:02:37 Modified: src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers FtpDeployer.java FileDeployer.java src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer DefaultArtifactDeployer.java MavenDeployRequest.java src/plugins-build/artifact/src/main/org/apache/maven/deploy DeployRequest.java DeployTool.java Log: FTP, FILE deployers work. ssh(scp) on the way Revision Changes Path 1.2 +4 -4 maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java Index: FtpDeployer.java =================================================================== RCS file: /home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FtpDeployer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FtpDeployer.java 17 Jun 2003 22:05:59 -0000 1.1 +++ FtpDeployer.java 19 Jun 2003 22:02:36 -0000 1.2 @@ -91,8 +91,7 @@ { String username = request.getUser(); String password = request.getPass(); - String host = request.getHost(); - + String host = request.getHost(); FTPClient ftp = new FTPClient(); @@ -142,7 +141,8 @@ __main : try { - if (ftp.login(username, password) == false) + System.out.println("username: '" + username +"' password: '"+ password+"'"); + if (ftp.login(username.trim(), password.trim()) == false) { ftp.logout(); break __main; 1.2 +18 -8 maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java Index: FileDeployer.java =================================================================== RCS file: /home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileDeployer.java 17 Jun 2003 22:05:59 -0000 1.1 +++ FileDeployer.java 19 Jun 2003 22:02:36 -0000 1.2 @@ -63,7 +63,6 @@ import org.apache.maven.deploy.DeployRequest; import org.apache.maven.deploy.exceptions.DeployException; - /** * * @author <a href="[EMAIL PROTECTED]">Michal Maczka</a> @@ -76,16 +75,27 @@ * @see org.apache.maven.fetch.fetchers.Fetcher#fetchUrl(java.lang.String, java.io.OutputStream) */ public void deploy(DeployRequest request) throws DeployException - { + { try { - File inputFile = new File( request.getInputFile() ); - File outputFile = new File( request.getOutputDir(), request.getOutputFile()); + File inputFile = new File(request.getInputFile()); + + File outputFile = + new File(request.getHost(), request.getOutputDir()); + + if (! outputFile.exists()) + { + outputFile.mkdirs(); + } + outputFile = new File( outputFile, request.getOutputFile()); + System.out.println("Copining from: " + inputFile + " to: " + outputFile); + + FileUtils.copyFile(inputFile, outputFile); } catch (IOException e) { - throw new DeployException("Cannot copy file: " + e.getMessage()); - } - } + throw new DeployException("Cannot copy file: " + e.getMessage()); + } + } } 1.4 +20 -9 maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java Index: DefaultArtifactDeployer.java =================================================================== RCS file: /home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultArtifactDeployer.java 19 Jun 2003 10:52:25 -0000 1.3 +++ DefaultArtifactDeployer.java 19 Jun 2003 22:02:37 -0000 1.4 @@ -205,35 +205,45 @@ // trick add special values to context for default repository; String repos = - (String) project.getContext().getVariable("maven.deploy.repos"); + (String) project.getContext().getVariable("maven.repo.repos"); + + System.out.println( "repos: "+ repos ); String distSite = project.getDistributionSite(); if (distSite != null && distSite.length() > 0) { project.getContext().setVariable( - "maven.deploy.repo.central", + "maven.repo.central", project.getDistributionSite()); project.getContext().setVariable( - "maven.deploy.repo.central.directory", + "maven.central.directory", project.getDistributionDirectory()); repos = "central, " + repos; } + - String repositoryPath = getRepositoryPath(type, project, version); - + if (repos == null || repos.length() == 0) + { + System.out.println("No remote repository is defined"); + return; + } String[] repoArray = StringUtils.split(repos, ","); System.out.println( "Will deploy to " + repoArray.length + " repo(s): " + repos); + + String repositoryPath = getRepositoryPath(type, project, version); + for (int i = 0; i < repoArray.length; i++) { - String repo = repoArray[i]; + String repo = repoArray[i].trim(); System.out.println("Deploying to repo: " + repo); MavenDeployRequest request = new MavenDeployRequest( + repo, project, repo, artifact, @@ -249,11 +259,12 @@ + request.getOutputDir()); try { - deployTool.performUpload(request); + deployTool.performUpload(request); } catch (Exception e) { - throw new MavenException("Cannot deploy", e); + e.printStackTrace(); + throw new MavenException("Cannot deploy. Reason:" + e.getMessage(), e); } } 1.3 +24 -22 maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/MavenDeployRequest.java Index: MavenDeployRequest.java =================================================================== RCS file: /home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/artifact/deployer/MavenDeployRequest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MavenDeployRequest.java 19 Jun 2003 10:52:25 -0000 1.2 +++ MavenDeployRequest.java 19 Jun 2003 22:02:37 -0000 1.3 @@ -79,6 +79,7 @@ * @param outputFile */ public MavenDeployRequest( + String repositoryAlias, Project project, String repository, String inputFile, @@ -86,62 +87,63 @@ String outputFile) { super(); + + setRepositoryAlias(repositoryAlias); + String url = + (String) project.getContext().getVariable( + "maven.repo." + repository); String username = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".username"); + "maven.repo." + repository + ".username"); System.out.println(repository + " username:" + username); String password = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".password"); + "maven.repo." + repository + ".password"); System.out.println(repository + " password: '" + password + "'"); String passphrase = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".passphrase"); + "maven.repo." + repository + ".passphrase"); String privateKey = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".privatekey"); - - String url = - (String) project.getContext().getVariable( - "maven.deploy.repo." + repository ); + "maven.repo." + repository + ".privatekey"); String dir = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".directory"); + "maven.repo." + repository + ".directory"); String port = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".port"); - + "maven.repo." + repository + ".port"); + String remoteGroup = - (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".remote.group"); + (String) project.getContext().getVariable( + "maven.repo." + repository + ".remote.group"); String proxyHost = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".proxy"); + "maven.repo." + repository + ".proxy"); String proxyUser = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".proxy.username"); - + "maven.repo." + repository + ".proxy.username"); + String proxyPassword = (String) project.getContext().getVariable( - "maven.deploy.repo." + repository + ".proxy.password"); + "maven.repo." + repository + ".proxy.password"); String proxyPort = (String) project.getContext().getVariable( - "maven.deploy." + repository + ".proxy.port"); + "maven." + repository + ".proxy.port"); setUser(username); setPass(password); setPassphrase(passphrase); - setPrivateKey(url); + setPrivateKey(url.trim()); setGroup(remoteGroup); - setUrl(url); + setUrl(url.trim()); try { @@ -156,7 +158,7 @@ } try { - setProxyPort(Integer.parseInt(proxyPort)); + setProxyPort(Integer.parseInt(proxyPort.trim())); } catch (Exception e) { 1.2 +22 -1 maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/DeployRequest.java Index: DeployRequest.java =================================================================== RCS file: /home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/DeployRequest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DeployRequest.java 17 Jun 2003 22:06:00 -0000 1.1 +++ DeployRequest.java 19 Jun 2003 22:02:37 -0000 1.2 @@ -63,8 +63,12 @@ */ public class DeployRequest { + + public final static int UNKNOWN_PORT = -1; + + private String repositoryAlias; private String url; private int port = UNKNOWN_PORT; private String outputDir; @@ -80,6 +84,14 @@ private String passphrase; private String privateKey; + /** + * @param repositoryAlias + */ + public void setRepositoryAlias(String repositoryAlias) + { + this.repositoryAlias = repositoryAlias; + } + public DeployRequest() { @@ -352,6 +364,15 @@ return "localhost"; } return url.substring(url.indexOf("://") + 3); + } + + /** + * @return + */ + public String getRepositoryAlias() + { + + return repositoryAlias; } } 1.2 +7 -2 maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/DeployTool.java Index: DeployTool.java =================================================================== RCS file: /home/cvs/maven/src/plugins-build/artifact/src/main/org/apache/maven/deploy/DeployTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DeployTool.java 17 Jun 2003 22:06:00 -0000 1.1 +++ DeployTool.java 19 Jun 2003 22:02:37 -0000 1.2 @@ -64,7 +64,6 @@ import org.apache.maven.deploy.exceptions.DeployException; import org.apache.maven.deploy.exceptions.UnsupportedProtocolDeployException; - /** * * @author <a href="[EMAIL PROTECTED]">Michal Maczka</a> @@ -80,6 +79,12 @@ String url = request.getUrl(); Deployer deployer = null; + if (url == null || url.length() == 1) + { + throw new DeployException( + "No URL provided for repsoitory: " + + request.getRepositoryAlias()); + } if (url.startsWith("http://")) { deployer = new HttpDeployer();
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]