Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed properties encoding 

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@739070 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-01-29 23:05:33 +00:00
parent e73ecd9a54
commit 58d995c047
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
its/core-it-support/core-it-wagon/pom.xml
View File

@ -34,9 +34,15 @@ under the License.
<dependencies>
<dependency>
<!--
NOTE: This is a dummy dependency required to make the DefaultExtensionManager load the wagon into the extension
container and not the core container. To be loaded into the extension container, an extension needs at least two
dependencies (not counting the ever present plexus-utils).
-->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>3.8.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>

31
its/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java vendored
View File

@ -19,11 +19,14 @@ package org.apache.maven.wagon.providers.ssh.external;
* under the License.
*/
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
import org.apache.maven.wagon.AbstractWagon;
import org.apache.maven.wagon.ConnectionException;
@ -34,8 +37,6 @@ import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringInputStream;
/**
* NOTE: Plexus will only pick this correctly if the Class package and name are the same as that in core. This is
@ -119,31 +120,47 @@ public class ScpExternalWagon
public void fillInputData( InputData inputData )
throws TransferFailedException, ResourceDoesNotExistException
{
inputData.setInputStream( new StringInputStream( "<metadata />" ) );
try
{
inputData.setInputStream( new ByteArrayInputStream( "<metadata />".getBytes( "UTF-8" ) ) );
}
catch ( IOException e )
{
throw new TransferFailedException( "Broken JVM", e );
}
}
public void fillOutputData( OutputData outputData )
throws TransferFailedException
{
String content = "";
Properties props = new Properties();
if ( getRepository().getPermissions() != null )
{
String dirPerms = getRepository().getPermissions().getDirectoryMode();
if ( dirPerms != null )
{
content += "directory.mode = " + dirPerms + "\n";
props.setProperty( "directory.mode", dirPerms );
}
String filePerms = getRepository().getPermissions().getFileMode();
if ( filePerms != null )
{
content += "file.mode = " + filePerms + "\n";
props.setProperty( "file.mode", filePerms );
}
}
try
{
FileUtils.fileWrite( "target/wagon.properties", content );
OutputStream os = new FileOutputStream( "target/wagon.properties" );
try
{
props.store( os, "MAVEN-CORE-IT-WAGON" );
}
finally
{
os.close();
}
}
catch ( IOException e )
{