You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2006/05/09 05:10:42 UTC
svn commit: r405287 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/
test/java/org/apache/maven/plugin/assembly/
test/java/org/apache/maven/plugin/assembly/stubs/
test/plugin-configs/assembly/ test/resour...
Author: epunzalan
Date: Mon May 8 20:10:39 2006
New Revision: 405287
URL: http://svn.apache.org/viewcvs?rev=405287&view=rev
Log:
PR: MASSEMBLY-88
Added tests cases for <files>
Removed parameter tempFile as it is not reusable in ArchiveManager
Added:
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filtered-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-output-name-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-plugin-config.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filtered.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-lineEndings.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-output-name.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem.xml (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-default-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-scoped-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-unpack-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/min-plugin-config.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-archiveBaseDirectory.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-crlf-lineEndings.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-dos-lineEndings.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-includes-excludes.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lf-lineEndings.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lineEndings-exception.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-unix-lineEndings.xml
maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java Mon May 8 20:10:39 2006
@@ -178,15 +178,6 @@
private File tempRoot;
/**
- * Temporary file for line ending translation.
- *
- * @parameter expression="${project.build.directory}/tempFile"
- * @required
- * @readonly
- */
- private File tempFile;
-
- /**
* Directory for site generated.
*
* @parameter expression="${project.build.directory}/site"
@@ -1313,14 +1304,21 @@
{
try
{
- copyReplacingLineEndings( source, this.tempFile, lineEnding );
+ if ( !tempRoot.exists() )
+ {
+ tempRoot.mkdirs();
+ }
+
+ File tempRootFile = File.createTempFile( source.getName() + ".", "", tempRoot );
+
+ copyReplacingLineEndings( source, tempRootFile, lineEnding );
+
+ source = tempRootFile;
}
catch ( IOException e )
{
throw new MojoExecutionException( "Error replacing line endings: " + e.getMessage(), e );
}
-
- source = this.tempFile;
}
outputDirectory = getOutputDirectory( outputDirectory, project, includeBaseDirecetory );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/AssemblyMojoTest.java Mon May 8 20:10:39 2006
@@ -449,6 +449,106 @@
assertTrue( true );
}
+ public void testFileItem()
+ throws Exception
+ {
+ generateTestFileSets( "\r\n" );
+
+ AssemblyMojo mojo = executeMojo( "fileItem-plugin-config.xml" );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ assertEquals( "Test archive files", 2, archiverFiles.size() );
+
+ Iterator files = archiverFiles.keySet().iterator();
+
+ File archivedFile = (File) files.next();
+
+ assertTrue( "Test if archived file exists", archivedFile.exists() );
+
+ if ( "README.txt".equals( archivedFile.getName() ) )
+ {
+ String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
+
+ assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
+ }
+
+ archivedFile = (File) files.next();
+
+ assertTrue( "Test if archived file exists", archivedFile.exists() );
+
+ if ( "README.txt".equals( archivedFile.getName() ) )
+ {
+ String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
+
+ assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
+ }
+ }
+
+ public void testFileItemWithOutputName()
+ throws Exception
+ {
+ generateTestFileSets( "\r\n" );
+
+ AssemblyMojo mojo = executeMojo( "fileItem-output-name-plugin-config.xml" );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ assertEquals( "Test archive files", 1, archiverFiles.size() );
+
+ File archivedFile = (File) archiverFiles.keySet().iterator().next();
+
+ ArchiverStub.ArchiverFile file = (ArchiverStub.ArchiverFile) archiverFiles.get( archivedFile );
+
+ assertEquals( "Test archive file path", "assembly/output/READTHIS.txt", file.getOutputName() );
+
+ assertTrue( "Test if archived file exists", archivedFile.exists() );
+
+ String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
+
+ assertTrue( "Test if file filtering is disabled", contents.indexOf( "${project.artifactId}" ) >= 0 );
+ }
+
+ public void testFileItemWithFiltering()
+ throws Exception
+ {
+ generateTestFileSets( "\r\n" );
+
+ executeMojo( "fileItem-filtered-plugin-config.xml" );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ assertEquals( "Test archive files", 1, archiverFiles.size() );
+
+ File archivedFile = (File) archiverFiles.keySet().iterator().next();
+
+ assertTrue( "Test if archived file exists", archivedFile.exists() );
+
+ String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
+
+ assertTrue( "Test if file filtering is enabled", contents.indexOf( "${project.artifactId}" ) < 0 );
+ }
+
+ public void testFileItemLineEndings()
+ throws Exception
+ {
+ generateTestFileSets( "\r\n" );
+
+ executeMojo( "fileItem-lineEndings-plugin-config.xml" );
+
+ Map archiverFiles = ArchiverManagerStub.archiverStub.getFiles();
+
+ assertEquals( "Test archive files", 1, archiverFiles.size() );
+
+ File archivedFile = (File) archiverFiles.keySet().iterator().next();
+
+ assertTrue( "Test if archived file exists", archivedFile.exists() );
+
+ String contents = FileUtils.fileRead( archivedFile.getAbsolutePath() );
+
+ assertTrue( "Test file line endings", contents.indexOf( "\r\n" ) < 0 );
+ }
+
private AssemblyMojo getMojo( String pluginXml )
throws Exception
{
@@ -510,7 +610,7 @@
"limitations under the License.";
FileUtils.fileWrite( fileSetDir + "/LICENSE.txt", fileContents );
- fileContents = "Readme file with only one line";
+ fileContents = "Readme file with only one line for ${project.artifactId}.";
FileUtils.fileWrite( fileSetDir + "/README.txt", fileContents );
fileContents = "sample configuration file line 1" + lineEnding + "sample configuration file line 2" +
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/stubs/AssemblyMavenProjectStub.java Mon May 8 20:10:39 2006
@@ -97,4 +97,39 @@
{
this.artifacts = artifacts;
}
+
+ public Properties getProperties()
+ {
+ return new Properties();
+ }
+
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public void setGroupId( String groupId )
+ {
+ this.groupId = groupId;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public void setArtifactId( String artifactId )
+ {
+ this.artifactId = artifactId;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-default-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-default-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-default-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-default-plugin-config.xml Mon May 8 20:10:39 2006
@@ -34,7 +34,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/depSet-default/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/depSet-default/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/depSet-default/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-filename-mapping-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/depSet-filename-mapping/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/depSet-filename-mapping/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/depSet-filename-mapping/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-scoped-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-scoped-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-scoped-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-scoped-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/depSet-scoped/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/depSet-scoped/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/depSet-scoped/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-unpack-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-unpack-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-unpack-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/depSet-unpack-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/depSet-unpack/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/depSet-unpack/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/depSet-unpack/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filtered-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filtered-plugin-config.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filtered-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filtered-plugin-config.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,45 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-filtered/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/fileItem-filtered/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptorRefs>
+ <descriptorRef>fileItem-filtered</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/fileItem-filtered/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-filtered/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-filtered-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,45 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-lineEndings/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/fileItem-lineEndings/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptorRefs>
+ <descriptorRef>fileItem-lineEndings</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/fileItem-lineEndings/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-lineEndings/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-lineEndings-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-output-name-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-output-name-plugin-config.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-output-name-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-output-name-plugin-config.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,45 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/fileItem-output-name/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/fileItem-output-name/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptorRefs>
+ <descriptorRef>fileItem-output-name</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/fileItem-output-name/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/fileItem-output-name/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-output-name-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-plugin-config.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-plugin-config.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-plugin-config.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,45 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>${basedir}/target/test-harness/assembly/fileItem/target</outputDirectory>
+ <finalName>assembly</finalName>
+ <workDirectory>${basedir}/target/test-harness/assembly/fileItem/work</workDirectory>
+ <archiverManager implementation="org.apache.maven.plugin.assembly.stubs.ArchiverManagerStub" />
+ <localRepository>${localRepository}</localRepository>
+ <reactorProjects></reactorProjects>
+ <classifier></classifier>
+ <project implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <executedProject implementation="org.apache.maven.plugin.assembly.stubs.AssemblyMavenProjectStub" />
+ <descriptorRefs>
+ <descriptorRef>fileItem</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>warn</tarLongFileMode>
+ <basedir>${basedir}</basedir>
+ <tempRoot>${basedir}/target/test-harness/assembly/fileItem/archive-tmp</tempRoot>
+ <siteDirectory>${basedir}/target/test-harness/assembly/fileItem/site</siteDirectory>
+ <includeSite>false</includeSite>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileItem-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-archiveBaseDir-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-archiveBaseDir/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-crlf-lineEndings-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-crlf-lineEndings/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-doesnt-exist-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-doesnt-exist/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-dos-lineEndings-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-dos-lineEndings/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-includes-excludes-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-include-exclude/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-include-exclude/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-include-exclude/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lf-lineEndings-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-lf-lineEndings/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-lineEndings-exception-plugin-config.xml Mon May 8 20:10:39 2006
@@ -36,7 +36,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-lineEndings-exception/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/fileSet-unix-lineEndings-plugin-config.xml Mon May 8 20:10:39 2006
@@ -35,7 +35,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/fileSet-unix-lineEndings/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/min-plugin-config.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/min-plugin-config.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/min-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/plugin-configs/assembly/min-plugin-config.xml Mon May 8 20:10:39 2006
@@ -34,7 +34,6 @@
<tarLongFileMode>warn</tarLongFileMode>
<basedir>${basedir}</basedir>
<tempRoot>${basedir}/target/test-harness/assembly/min/archive-tmp</tempRoot>
- <tempFile>${basedir}/target/test-harness/assembly/min/tempFile</tempFile>
<siteDirectory>${basedir}/target/test-harness/assembly/min/site</siteDirectory>
<includeSite>false</includeSite>
<appendAssemblyId>true</appendAssemblyId>
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filtered.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filtered.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filtered.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filtered.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,28 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>fileItem</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <files>
+ <file>
+ <source>target/test-classes/fileSet/README.txt</source>
+ <filtered>true</filtered>
+ </file>
+ </files>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-filtered.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-lineEndings.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-lineEndings.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-lineEndings.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-lineEndings.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,28 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>fileItem</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <files>
+ <file>
+ <source>target/test-classes/fileSet/README.txt</source>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-lineEndings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-output-name.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-output-name.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-output-name.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-output-name.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,29 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>fileItem</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <files>
+ <file>
+ <source>target/test-classes/fileSet/README.txt</source>
+ <outputDirectory>output</outputDirectory>
+ <destName>READTHIS.txt</destName>
+ </file>
+ </files>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem-output-name.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem.xml?rev=405287&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem.xml Mon May 8 20:10:39 2006
@@ -0,0 +1,30 @@
+<!--
+ ~ Copyright 2001-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly>
+ <id>fileItem</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <files>
+ <file>
+ <source>target/test-classes/fileSet/README.txt</source>
+ </file>
+ <file>
+ <source>target/test-classes/fileSet/LICENSE.txt</source>
+ </file>
+ </files>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileItem.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-archiveBaseDirectory.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-archiveBaseDirectory.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-archiveBaseDirectory.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-archiveBaseDirectory.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-crlf-lineEndings.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-crlf-lineEndings.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-crlf-lineEndings.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-crlf-lineEndings.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-doesnt-exist.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-dos-lineEndings.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-dos-lineEndings.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-dos-lineEndings.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-dos-lineEndings.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-includes-excludes.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-includes-excludes.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-includes-excludes.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-includes-excludes.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lf-lineEndings.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lf-lineEndings.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lf-lineEndings.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lf-lineEndings.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lineEndings-exception.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lineEndings-exception.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lineEndings-exception.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-lineEndings-exception.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-unix-lineEndings.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-unix-lineEndings.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-unix-lineEndings.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet-unix-lineEndings.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet.xml?rev=405287&r1=405286&r2=405287&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/resources/assemblies/fileSet.xml Mon May 8 20:10:39 2006
@@ -15,7 +15,7 @@
-->
<assembly>
- <id>simple</id>
+ <id>fileSet</id>
<formats>
<format>zip</format>
</formats>