You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/09/25 22:27:32 UTC
svn commit: r699077 - in
/maven/plugins/trunk/maven-assembly-plugin/src/it/projects:
basic-features/assemblyDescriptor-artifact/
basic-features/file-copyIntoTopDir/ basic-features/file-sameName/
basic-features/massembly-256-pomPropertiesInterp/ basic-f...
Author: jdcasey
Date: Thu Sep 25 13:27:31 2008
New Revision: 699077
URL: http://svn.apache.org/viewvc?rev=699077&view=rev
Log:
[MASSEMBLY-239] Correct integration tests using dir format for new parameter default.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/assemblyDescriptor-artifact/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,8 +6,8 @@
try
{
- File a = new File( basedir, "assembly/target/assembly-1-fromArtifact.dir/a/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-fromArtifact.dir/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-fromArtifact/a/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-fromArtifact/b/file.txt");
if(result) {
BufferedReader r = new BufferedReader(new FileReader(a));
String s = r.readLine();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-copyIntoTopDir/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,7 +6,7 @@
try
{
- result = new File( basedir, "target/parent-1.0-bug-example.dir/TODO.txt" ).exists();
+ result = new File( basedir, "target/parent-1.0-bug-example/TODO.txt" ).exists();
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/file-sameName/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,8 +6,8 @@
try
{
- File a = new File( basedir, "target/parent-1.0-massembly-148-example.dir/a/file.txt");
- File b = new File( basedir, "target/parent-1.0-massembly-148-example.dir/b/file.txt");
+ File a = new File( basedir, "target/parent-1.0-massembly-148-example/a/file.txt");
+ File b = new File( basedir, "target/parent-1.0-massembly-148-example/b/file.txt");
if(result) {
BufferedReader r = new BufferedReader(new FileReader(a));
String s = r.readLine();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,8 +1,8 @@
import java.io.*;
-File f = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly.dir/file/path/some.file" );
-File f2 = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly.dir/file2/path/some.file" );
-File f3 = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly.dir/file3/path/some.file" );
+File f = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file/path/some.file" );
+File f2 = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file2/path/some.file" );
+File f3 = new File( basedir, "target/massembly-256-pomPropertiesInterp-1-myassembly/file3/path/some.file" );
boolean fOK = f.exists() && f.isFile();
if ( !fOK )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/massembly-351-projectPrefixInterp/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,8 +1,8 @@
import java.io.*;
-File f = new File( basedir, "target/project-1-myassembly.dir/files/project1.file" );
-File f2 = new File( basedir, "target/project-1-myassembly.dir/files/project2.file" );
-File f3 = new File( basedir, "target/project-1-myassembly.dir/files/project3.file" );
+File f = new File( basedir, "target/project-1-myassembly/files/project1.file" );
+File f2 = new File( basedir, "target/project-1-myassembly/files/project2.file" );
+File f3 = new File( basedir, "target/project-1-myassembly/files/project3.file" );
boolean fOK = f.exists() && f.isFile();
if ( !fOK )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,7 +6,7 @@
try
{
- result = new File( basedir, "target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin.dir/lib/plexus-utils-1.3-SNAPSHOT.jar" ).exists();
+ result = new File( basedir, "target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin/lib/plexus-utils-1.3-SNAPSHOT.jar" ).exists();
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,7 +1,7 @@
import java.io.*;
-File child1Codec = new File( basedir, "target/project-1-bin.dir/child-1/commons-codec-1.3.jar" );
-File child2Codec = new File( basedir, "target/project-1-bin.dir/child-2/commons-codec-1.3.jar" );
+File child1Codec = new File( basedir, "target/project-1-bin/child-1/commons-codec-1.3.jar" );
+File child2Codec = new File( basedir, "target/project-1-bin/child-2/commons-codec-1.3.jar" );
if ( !child1Codec.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/pom.xml Thu Sep 25 13:27:31 2008
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
<groupId>org.test</groupId>
<artifactId>assembly</artifactId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh Thu Sep 25 13:27:31 2008
@@ -4,8 +4,8 @@
try
{
- File a = new File( basedir, "assembly/target/assembly-1-bin.dir/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-bin.dir/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but was not." );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/assembly/pom.xml Thu Sep 25 13:27:31 2008
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
<groupId>org.test</groupId>
<version>1</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh Thu Sep 25 13:27:31 2008
@@ -4,8 +4,8 @@
try
{
- File a = new File( basedir, "assembly/target/assembly-1-bin.dir/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-bin.dir/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but was not." );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/assembly/pom.xml Thu Sep 25 13:27:31 2008
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
<groupId>org.test</groupId>
<version>1</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh Thu Sep 25 13:27:31 2008
@@ -4,8 +4,8 @@
try
{
- File a = new File( basedir, "assembly/target/assembly-1-bin.dir/file.txt");
- File b = new File( basedir, "assembly/target/assembly-1-bin.dir/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but was not." );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dep-with-transitive-filter/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,7 +1,7 @@
import java.io.*;
-File wagonJackrabbitJar = new File( basedir, "target/project-1-bin.dir/maven-libs/wagon-webdav-jackrabbit-1.0-beta-4.jar" );
-File xercesMinimalJar = new File( basedir, "target/project-1-bin.dir/maven-libs/xercesMinimal-1.9.6.2.jar" );
+File wagonJackrabbitJar = new File( basedir, "target/project-1-bin/maven-libs/wagon-webdav-jackrabbit-1.0-beta-4.jar" );
+File xercesMinimalJar = new File( basedir, "target/project-1-bin/maven-libs/xercesMinimal-1.9.6.2.jar" );
if ( !wagonJackrabbitJar.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-projectArtifactNotIncluded/verify.bsh Thu Sep 25 13:27:31 2008
@@ -5,9 +5,9 @@
basedir = new File( "." );
}
-File depFile = new File( basedir, "target/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT-bin.dir/lib/commons-logging-1.0.4.jar" );
+File depFile = new File( basedir, "target/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT-bin/lib/commons-logging-1.0.4.jar" );
-File projectArtifactFile = new File( basedir, "target/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT-bin.dir/lib/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT.war" );
+File projectArtifactFile = new File( basedir, "target/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT-bin/lib/dependencySet-projectArtifactNotIncluded-1.0-SNAPSHOT.war" );
System.out.println( "result: " + ( depFile.exists() && !projectArtifactFile.exists() ) );
return depFile.exists() && !projectArtifactFile.exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/dependencySet-withExecutedProject/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,7 +6,7 @@
try
{
- result = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.dir/lib/child1.jar" ).exists();
+ result = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/lib/child1.jar" ).exists();
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-artifact/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,7 +6,7 @@
try
{
- File dir = new File( basedir, "target/include-project-artifact-1.0-SNAPSHOT-bin.dir" );
+ File dir = new File( basedir, "target/include-project-artifact-1.0-SNAPSHOT-bin" );
System.out.println( "Checking for existence and file-ishness of: " + dir );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/include-project-attachments/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,7 +6,7 @@
try
{
- File dir = new File( basedir, "target/include-project-attachments-1.0-SNAPSHOT-bin.dir" );
+ File dir = new File( basedir, "target/include-project-attachments-1.0-SNAPSHOT-bin" );
System.out.println( "Checking for existence and file-ishness of: " + dir );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-pom-dependency/verify.bsh Thu Sep 25 13:27:31 2008
@@ -3,14 +3,14 @@
boolean result = true;
// verify that transitive deps of the POM dep were included.
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin.dir/lib/plexus-utils" ).exists();
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin.dir/lib/classworlds" ).exists();
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin.dir/lib/junit" ).exists();
+result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/plexus-utils" ).exists();
+result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/classworlds" ).exists();
+result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/junit" ).exists();
// verify that the POM dep was included without extracting.
-result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin.dir/lib/plexus-container-default.pom" ).exists();
+result = result && new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/plexus-container-default.pom" ).exists();
// verify that the jar associated with the POM dep wasn't included either.
-result = result && !new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin.dir/lib/plexus-container-default" ).exists();
+result = result && !new File( basedir, "target/including-pom-dependency-1.0-SNAPSHOT-bin/lib/plexus-container-default" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/including-sar-dependency/verify.bsh Thu Sep 25 13:27:31 2008
@@ -3,9 +3,9 @@
boolean result = true;
// verify that transitive deps of the POM dep were included.
-result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin.dir/lib/xmlrpc" ).exists();
-result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin.dir/lib/plexus-xmlrpc" ).exists();
+result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin/lib/xmlrpc" ).exists();
+result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin/lib/plexus-xmlrpc" ).exists();
-result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin.dir/lib/plexus-appserver-service-xmlrpc/lib/commons-codec-1.3.jar" ).exists();
+result = result && new File( basedir, "target/including-sar-dependency-1.0-SNAPSHOT-bin/lib/plexus-appserver-service-xmlrpc/lib/commons-codec-1.3.jar" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-201/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,8 +1,8 @@
import java.io.*;
-File main = new File( basedir, "target/massembly-201-1-bin.dir/maven-model-2.0.9.jar" );
-File sources = new File( basedir, "target/massembly-201-1-bin.dir/maven-model-2.0.9-sources.jar" );
-File javadocs = new File( basedir, "target/massembly-201-1-bin.dir/maven-model-2.0.9-javadoc.jar" );
+File main = new File( basedir, "target/massembly-201-1-bin/maven-model-2.0.9.jar" );
+File sources = new File( basedir, "target/massembly-201-1-bin/maven-model-2.0.9-sources.jar" );
+File javadocs = new File( basedir, "target/massembly-201-1-bin/maven-model-2.0.9-javadoc.jar" );
if ( !main.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-232/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File file = new File( basedir, "target/massembly-232-1-dist.dir/massembly-232-1/etc/hello.txt" );
+File file = new File( basedir, "target/massembly-232-1-dist/massembly-232-1/etc/hello.txt" );
System.out.println( "Test file exists? " + file.exists() );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-235/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File dir = new File( basedir, "target/massembly235-test-1-release.dir" );
+File dir = new File( basedir, "target/massembly235-test-1-release" );
File goodJar = new File( dir, "xmlenc-0.52.jar" );
File badJar = new File( dir, "xmlenc-0.39.jar" );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,11 +2,11 @@
boolean result = true;
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin.dir/lib/jdom.jar" ).exists();
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin.dir/lib/velocity.jar" ).exists();
+result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/lib/jdom.jar" ).exists();
+result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/lib/velocity.jar" ).exists();
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin.dir/modules/module-a.jar" ).exists();
-result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin.dir/modules/module-b.jar" ).exists();
+result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
+result = result && new File( basedir, "target/massembly-99-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/multiple-wildcard-includes/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,7 +1,7 @@
import java.io.*;
-File wagonProviderJar = new File( basedir, "target/massembly-241-1-bin.dir/maven-libs/wagon-provider-api-1.0-beta-4.jar" );
-File reportingImplJar = new File( basedir, "target/massembly-241-1-bin.dir/maven-libs/maven-reporting-impl-2.0.4.1.jar" );
+File wagonProviderJar = new File( basedir, "target/massembly-241-1-bin/maven-libs/wagon-provider-api-1.0-beta-4.jar" );
+File reportingImplJar = new File( basedir, "target/massembly-241-1-bin/maven-libs/maven-reporting-impl-2.0.4.1.jar" );
if ( !wagonProviderJar.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,7 +1,7 @@
import java.io.*;
// verify that the ear is created
-File dirWithMapping = new File( basedir, "target/project-1-bin.dir/some_directory/junit.jar/" );
+File dirWithMapping = new File( basedir, "target/project-1-bin/some_directory/junit.jar/" );
if ( dirWithMapping.exists() )
{
@@ -9,7 +9,7 @@
return false;
}
-File dir = new File( basedir, "target/project-1-bin.dir/some_directory/junit/framework/TestCase.class" );
+File dir = new File( basedir, "target/project-1-bin/some_directory/junit/framework/TestCase.class" );
if ( !dir.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,11 +2,11 @@
boolean result = true;
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin.dir/modules/jdom.jar" ).exists();
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin.dir/modules/velocity.jar" ).exists();
+result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/jdom.jar" ).exists();
+result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/velocity.jar" ).exists();
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin.dir/modules/module-a.jar" ).exists();
-result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin.dir/modules/module-b.jar" ).exists();
+result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/module-a.jar" ).exists();
+result = result && new File( basedir, "target/using-moduleSet-implied-depSet-1.0-SNAPSHOT-bin/modules/module-b.jar" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-directory-unspecified/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-String assemblyDir = "target/default-directory-unspecified-1.0-SNAPSHOT-src.dir/";
+String assemblyDir = "target/default-directory-unspecified-1.0-SNAPSHOT-src/";
result = result && new File( basedir, assemblyDir + "build.log" ).exists();
result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/default-excludes-unspecified/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-String assemblyDir = "target/default-excludes-unspecified-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+String assemblyDir = "target/default-excludes-unspecified-1.0-SNAPSHOT-src/src/main/assembly/";
result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/dont-use-default-excludes/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-String assemblyDir = "target/dont-use-default-excludes-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+String assemblyDir = "target/dont-use-default-excludes-1.0-SNAPSHOT-src/src/main/assembly/";
result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
result = result && new File( basedir, assemblyDir + ".svn" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excluding-svn-dirs/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-String assemblyDir = "target/excluding-svn-dirs-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+String assemblyDir = "target/excluding-svn-dirs-1.0-SNAPSHOT-src/src/main/assembly/";
result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-module-sources/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File f = new File( basedir, "target/parent-1-src.dir/child/test.txt" );
+File f = new File( basedir, "target/parent-1-src/child/test.txt" );
if ( !f.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/filtered-multimodule/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File f = new File( basedir, "child/target/child-1-src.dir/test.txt" );
+File f = new File( basedir, "child/target/child-1-src/test.txt" );
if ( !f.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-base-directory/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-String assemblyDir = "target/include-base-directory-1.0-SNAPSHOT-src.dir/include-base-directory-1.0-SNAPSHOT/src/main/assembly/";
+String assemblyDir = "target/include-base-directory-1.0-SNAPSHOT-src/include-base-directory-1.0-SNAPSHOT/src/main/assembly/";
result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/include-parent-dir/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,3 +1,3 @@
import java.io.*;
-return new File( basedir, "child/target/child-1.0-SNAPSHOT-parent.dir/child/pom.xml" ).exists();
+return new File( basedir, "child/target/child-1.0-SNAPSHOT-parent/child/pom.xml" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-unix-lineEndings/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File f = new File( basedir, "child/target/child-1-src.dir/test.txt" );
+File f = new File( basedir, "child/target/child-1-src/test.txt" );
if ( !f.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/multimodule-win-lineEndings/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File f = new File( basedir, "child/target/child-1-src.dir/test.txt" );
+File f = new File( basedir, "child/target/child-1-src/test.txt" );
if ( !f.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/use-default-excludes/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-String assemblyDir = "target/use-default-excludes-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+String assemblyDir = "target/use-default-excludes-1.0-SNAPSHOT-src/src/main/assembly/";
result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filtersDefinedInAssemblyPluginConfig/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,7 +6,7 @@
try
{
- File file = new File( basedir, "target/parent-1.0-filtered-assembly.dir/file.txt");
+ File file = new File( basedir, "target/parent-1.0-filtered-assembly/file.txt");
if(result) {
BufferedReader r = new BufferedReader(new FileReader(file));
String s = r.readLine();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,3 +1,3 @@
import java.io.File;
-return new File( basedir, "target/single-in-one-project-hierarchy-1.0-SNAPSHOT-bin.dir/lib/junit.jar" ).exists();
+return new File( basedir, "target/single-in-one-project-hierarchy-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-result = result && new File( basedir, "child1/target/child1-1.0-SNAPSHOT-bin.dir/lib/junit.jar" ).exists();
-result = result && new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin.dir/lib/junit.jar" ).exists();
+result = result && new File( basedir, "child1/target/child1-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists();
+result = result && new File( basedir, "child2/target/child2-1.0-SNAPSHOT-bin/lib/junit.jar" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,7 +2,7 @@
boolean result = true;
-result = result && new File( basedir, "target/first-bin.dir/lib/junit.jar" ).exists();
-result = result && new File( basedir, "target/second-bin.dir/lib/junit.jar" ).exists();
+result = result && new File( basedir, "target/first-bin/lib/junit.jar" ).exists();
+result = result && new File( basedir, "target/second-bin/lib/junit.jar" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,8 +2,8 @@
boolean result = true;
-result = result && new File( basedir, "target/parent-1.0-src.dir/sources/child1/pom.xml" ).exists();
+result = result && new File( basedir, "target/parent-1.0-src/sources/child1/pom.xml" ).exists();
-result = result && !new File( basedir, "target/parent-1.0-src.dir/sources/child2/pom.xml" ).exists();
+result = result && !new File( basedir, "target/parent-1.0-src/sources/child2/pom.xml" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/verify.bsh Thu Sep 25 13:27:31 2008
@@ -2,9 +2,9 @@
boolean result = true;
-result = result && new File( basedir, "target/parent-1.0-bin.dir/lib/child1.jar" ).exists();
-result = result && new File( basedir, "target/parent-1.0-bin.dir/lib/child3.jar" ).exists();
+result = result && new File( basedir, "target/parent-1.0-bin/lib/child1.jar" ).exists();
+result = result && new File( basedir, "target/parent-1.0-bin/lib/child3.jar" ).exists();
-result = result && !new File( basedir, "target/parent-1.0-bin.dir/lib/child2.jar" ).exists();
+result = result && !new File( basedir, "target/parent-1.0-bin/lib/child2.jar" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,9 +6,9 @@
try
{
- result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin.dir/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
+ result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
- result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin.dir/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
+ result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/verify.bsh Thu Sep 25 13:27:31 2008
@@ -6,8 +6,8 @@
try
{
- result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin.dir/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
- result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin.dir/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
+ result = new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
+ result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists();
}
catch( IOException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/verify.bsh Thu Sep 25 13:27:31 2008
@@ -3,7 +3,7 @@
boolean result = true;
String finalName = "two-levels-includeBaseDirectory-withBinaries-1.0-SNAPSHOT";
-String rootDir = "target/" + finalName + "-bin.dir/" + finalName + "/modules/";
+String rootDir = "target/" + finalName + "-bin/" + finalName + "/modules/";
result = result && new File( basedir, rootDir + "child-level1-project1-1.0-SNAPSHOT.jar" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/verify.bsh Thu Sep 25 13:27:31 2008
@@ -5,7 +5,7 @@
boolean result = true;
String finalName = "two-levels-includeBaseDirectory-withSources-1.0-SNAPSHOT";
-String rootDir = "target/" + finalName + "-src.dir/" + finalName + "/modules/";
+String rootDir = "target/" + finalName + "-src/" + finalName + "/modules/";
result = result && new File( basedir, rootDir + "child-level1-project1/pom.xml" ).exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh Thu Sep 25 13:27:31 2008
@@ -4,10 +4,10 @@
boolean result = true;
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project1/pom.xml" ).exists();
+result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project1/pom.xml" ).exists();
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project2/pom.xml" ).exists();
+result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/pom.xml" ).exists();
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project2/child-level2-project1/pom.xml" ).exists();
+result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/child-level2-project1/pom.xml" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh Thu Sep 25 13:27:31 2008
@@ -4,18 +4,18 @@
boolean result = true;
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project1/pom.xml" ).exists();
+result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project1/pom.xml" ).exists();
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project2/pom.xml" ).exists();
+result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/pom.xml" ).exists();
-result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level2-project1/pom.xml" ).exists();
+result = result && new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level2-project1/pom.xml" ).exists();
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project2/child-level2-project1/pom.xml" ).exists();
+result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/child-level2-project1/pom.xml" ).exists();
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project1/target" ).exists();
+result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project1/target" ).exists();
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level1-project2/target" ).exists();
+result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level1-project2/target" ).exists();
-result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src.dir/child-level2-project1/target" ).exists();
+result = result && !new File( basedir, "target/two-level-multimodule-1.0-SNAPSHOT-src/child-level2-project1/target" ).exists();
return result;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,6 +1,6 @@
import java.io.*;
-File junitJar = new File( basedir, "target/assembly-bin.dir/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
+File junitJar = new File( basedir, "target/assembly-bin/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
return junitJar.exists();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-196/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,7 +1,7 @@
import java.io.File;
-File jarPlugin = new File( basedir, "target/massembly-196-1-bin.dir/repo/org/apache/maven/plugins/maven-jar-plugin/2.0/maven-jar-plugin-2.0.jar" );
-File surefirePlugin = new File( basedir, "target/massembly-196-1-bin.dir/repo/org/apache/maven/plugins/maven-surefire-plugin/2.3/maven-surefire-plugin-2.3.jar" );
+File jarPlugin = new File( basedir, "target/massembly-196-1-bin/repo/org/apache/maven/plugins/maven-jar-plugin/2.0/maven-jar-plugin-2.0.jar" );
+File surefirePlugin = new File( basedir, "target/massembly-196-1-bin/repo/org/apache/maven/plugins/maven-surefire-plugin/2.3/maven-surefire-plugin-2.3.jar" );
if ( !jarPlugin.exists() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh?rev=699077&r1=699076&r2=699077&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh Thu Sep 25 13:27:31 2008
@@ -1,18 +1,18 @@
import java.io.*;
-File junitJar = new File( basedir, "child/target/assembly-bin.dir/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
+File junitJar = new File( basedir, "child/target/assembly-bin/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
boolean junitExists = junitJar.exists();
-File plexusUtilsJar = new File( basedir, "child/target/assembly-bin.dir/repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar" );
+File plexusUtilsJar = new File( basedir, "child/target/assembly-bin/repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar" );
boolean puJarExists = plexusUtilsJar.exists();
-File plexusUtilsPom = new File( basedir, "child/target/assembly-bin.dir/repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom" );
+File plexusUtilsPom = new File( basedir, "child/target/assembly-bin/repo/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom" );
boolean puPomExists = plexusUtilsPom.exists();
-File plexusPom = new File( basedir, "child/target/assembly-bin.dir/repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom" );
+File plexusPom = new File( basedir, "child/target/assembly-bin/repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom" );
boolean plexusPomExists = plexusPom.exists();
-File parentPom = new File( basedir, "child/target/assembly-bin.dir/repo/org/apache/maven/plugin/assembly/test/repo-with-snapshot-parents/1-SNAPSHOT/repo-with-snapshot-parents-1-SNAPSHOT.pom" );
+File parentPom = new File( basedir, "child/target/assembly-bin/repo/org/apache/maven/plugin/assembly/test/repo-with-snapshot-parents/1-SNAPSHOT/repo-with-snapshot-parents-1-SNAPSHOT.pom" );
boolean plexusPomExists = plexusPom.exists();
return junitExists && puJarExists && puPomExists && plexusPomExists && parentPomExists;