Skip to content

Commit ff7a032

Browse files
committed
Merge pull request #21 from benson-basis/master
Finish the job.
2 parents 4da118f + 47d768f commit ff7a032

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/main/resources/META-INF/plexus/components.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,13 @@
202202
<instantiation-strategy>per-lookup</instantiation-strategy>
203203
</component>
204204

205+
<component>
206+
<role>org.codehaus.plexus.archiver.UnArchiver</role>
207+
<role-hint>tar.snappy</role-hint>
208+
<implementation>org.codehaus.plexus.archiver.tar.TarSnappyUnArchiver</implementation>
209+
<instantiation-strategy>per-lookup</instantiation-strategy>
210+
</component>
211+
205212
<!--
206213
|
207214
| ArchiverManager

src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testCreateArchive()
5151
zipArchiver.addDirectory( getTestFile( "src" ) );
5252
zipArchiver.setDestFile( getTestFile( "target/output/archiveForSnappy.zip" ) );
5353
zipArchiver.createArchive();
54-
SnappyArchiver archiver = (SnappyArchiver) lookup( Archiver.ROLE, "Snappy" );
54+
SnappyArchiver archiver = (SnappyArchiver) lookup( Archiver.ROLE, "snappy" );
5555
String[] inputFiles = new String[ 1 ];
5656
inputFiles[ 0 ] = "archiveForsnappy.zip";
5757
archiver.addDirectory( getTestFile( "target/output" ), inputFiles, null );
@@ -98,7 +98,7 @@ public void testCreateResourceCollection()
9898
*/
9999
public void testsnappyIsForcedBehaviour() throws Exception
100100
{
101-
SnappyArchiver SnappyArchiver = (SnappyArchiver) createArchiver( "Snappy" );
101+
SnappyArchiver SnappyArchiver = (SnappyArchiver) createArchiver( "snappy" );
102102

103103
assertTrue( SnappyArchiver.isSupportingForced() );
104104
SnappyArchiver.createArchive();
@@ -107,7 +107,7 @@ public void testsnappyIsForcedBehaviour() throws Exception
107107

108108
waitUntilNewTimestamp( SnappyArchiver.getDestFile(), creationTime );
109109

110-
SnappyArchiver = (SnappyArchiver) createArchiver( "Snappy" );
110+
SnappyArchiver = (SnappyArchiver) createArchiver( "snappy" );
111111

112112
SnappyArchiver.setForced( true );
113113
SnappyArchiver.createArchive();
@@ -116,7 +116,7 @@ public void testsnappyIsForcedBehaviour() throws Exception
116116

117117
assertFalse( creationTime==firstRunTime );
118118

119-
SnappyArchiver = (SnappyArchiver) createArchiver( "Snappy" );
119+
SnappyArchiver = (SnappyArchiver) createArchiver( "snappy" );
120120

121121
SnappyArchiver.setForced( false );
122122
SnappyArchiver.createArchive();

src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testExtract()
6363
snappyArchiver.addFile( getTestFile( "target/output/archive.tar" ), "dontcare" );
6464
snappyArchiver.createArchive();
6565

66-
TarSnappyUnArchiver tarSnappyUnArchiver = (TarSnappyUnArchiver) lookup( UnArchiver.ROLE, "snappy" );
66+
TarSnappyUnArchiver tarSnappyUnArchiver = (TarSnappyUnArchiver) lookup( UnArchiver.ROLE, "tar.snappy" );
6767
tarSnappyUnArchiver.setDestDirectory(getTestFile("target/output"));
6868
tarSnappyUnArchiver.setSourceFile(testSnappyFile);
6969
tarSnappyUnArchiver.extract();

0 commit comments

Comments
 (0)