Author: eworley
Date: Fri Jan 4 00:22:25 2008
New Revision: 608769
URL: http://svn.apache.org/viewvc?rev=608769&view=rev
Log:
* Added BUILD_SOURCES_MAIN, BUILD_SOURCES_GENERATED, TEST_SOURCES_MAIN,
TEST_SOURCES_GENERATED to BuildDirectories
* Refactored source processors to use the *MAIN directories, and am only
running src synchronization between the main directories and source (e.g. not
pruning in generated sources)
* Updated the tests to expect files in the updated directory structure
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AbstractSourceProcessorMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
Fri Jan 4 00:22:25 2008
@@ -173,7 +173,7 @@
{
AssemblyInfoMarshaller marshaller =
(AssemblyInfoMarshaller) c.newInstance();
marshaller.init( programmingLanguage, new File(
mavenProject.getBuild().getDirectory(),
-
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() ) );
+
BuildDirectories.BUILD_SOURCES_GENERATED.getBuildDirectoryName() ) );
marshallers.add( marshaller );
}
}
Modified:
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
Fri Jan 4 00:22:25 2008
@@ -24,7 +24,11 @@
public enum BuildDirectories
{
BUILD_SOURCES("build-sources"),
+ BUILD_SOURCES_MAIN("build-sources/main-sources"),
+ BUILD_SOURCES_GENERATED("build-sources/generated-sources"),
TEST_SOURCES("test-sources"),
+ TEST_SOURCES_MAIN("test-sources/main-sources"),
+ TEST_SOURCES_GENERATED("test-sources/generated-sources"),
ASSEMBLY_RESOURCES("assembly-resources");
private String buildDirectoryName;
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java
Fri Jan 4 00:22:25 2008
@@ -16,7 +16,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0000-CSharpCompileLibrary" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0000.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0000.cs" );
verifier.assertFilePresent( "target/comments.xml" );
verifier.assertFilePresent( "target/NMaven.It.It0000-1.0.0.dll" );
verifier.verifyErrorFreeLog();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
Fri Jan 4 00:22:25 2008
@@ -16,7 +16,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0001-CSharpCompileExe" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0001.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0001.cs" );
verifier.assertFilePresent( "target/comments.xml" );
verifier.assertFilePresent( "target/NMaven.It.It0001-1.0.0.exe" );
verifier.verifyErrorFreeLog();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
Fri Jan 4 00:22:25 2008
@@ -16,7 +16,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0002-CSharpCompileModule" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0002.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0002.cs" );
verifier.assertFilePresent( "target/comments.xml" );
verifier.assertFilePresent( "target/NMaven.It.It0002-1.0.0.netmodule"
);
verifier.verifyErrorFreeLog();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java
Fri Jan 4 00:22:25 2008
@@ -16,7 +16,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0003-CSharpCompileWinexe" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0003.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0003.cs" );
verifier.assertFilePresent( "target/comments.xml" );
verifier.assertFilePresent( "target/NMaven.It.It0003-1.0.0.exe" );
verifier.verifyErrorFreeLog();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java
Fri Jan 4 00:22:25 2008
@@ -17,7 +17,7 @@
ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0004-CSharpCompileWithDependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0004.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0004.cs" );
verifier.assertFilePresent( "target/comments.xml" );
verifier.assertFilePresent( "target/NMaven.It.It0004-1.0.0.dll" );
verifier.verifyErrorFreeLog();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
Fri Jan 4 00:22:25 2008
@@ -17,7 +17,7 @@
ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0005-CSharpCompileWithTransitiveDependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0005.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0005.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0005-1.0.0.dll" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
Fri Jan 4 00:22:25 2008
@@ -16,8 +16,8 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0007-CSharpCompileTestLibrary" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/App.cs" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() + "/It0007.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/App.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.TEST_SOURCES_MAIN.getBuildDirectoryName() + "/It0007.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0007-1.0.0-test.dll" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java
Fri Jan 4 00:22:25 2008
@@ -17,7 +17,7 @@
ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0008-CSharpCompileWithProvidedDependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0008.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0008.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0008-1.0.0.dll" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java
Fri Jan 4 00:22:25 2008
@@ -17,7 +17,7 @@
ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0009-CSharpCompileWithProvidedGacDependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0009.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0009.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0009-1.0.0.dll" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java
Fri Jan 4 00:22:25 2008
@@ -16,7 +16,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0010-DeployLibrary" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0010.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0010.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0010-1.0.0.dll" );
verifier.assertFilePresent(
"target/test-repo/NMaven/Its/NMaven.It.It0010/1.0.0/NMaven.It.It0010-1.0.0.dll"
);
verifier.assertFilePresent(
"target/test-repo/NMaven/Its/NMaven.It.It0010/1.0.0/NMaven.It.It0010-1.0.0.pom"
);
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java
Fri Jan 4 00:22:25 2008
@@ -21,7 +21,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0011-DeployExe" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0011.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0011.cs" );
verifier.assertFilePresent( "target/" + artifactName + ".exe" );
verifier.assertFilePresent( artifactDir + artifactName + ".exe" );
verifier.assertFilePresent( artifactDir + artifactName + ".pom" );
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java
Fri Jan 4 00:22:25 2008
@@ -21,7 +21,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0012-DeployModule" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0012.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0012.cs" );
verifier.assertFilePresent( "target/" + artifactName + ".netmodule" );
verifier.assertFilePresent( artifactDir + artifactName + ".netmodule"
);
verifier.assertFilePresent( artifactDir + artifactName + ".pom" );
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java
Fri Jan 4 00:22:25 2008
@@ -21,7 +21,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0013-DeployWinexe" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0013.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0013.cs" );
verifier.assertFilePresent( "target/" + artifactName + ".exe" );
verifier.assertFilePresent( artifactDir + artifactName + ".exe" );
verifier.assertFilePresent( artifactDir + artifactName + ".pom" );
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
Fri Jan 4 00:22:25 2008
@@ -19,7 +19,7 @@
verifier.deleteArtifact( "NMaven.Its", "NMaven.It.It0010", "1.0.0",
"dll" );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0014.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0014.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0014-1.0.0.dll" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
Fri Jan 4 00:22:25 2008
@@ -23,7 +23,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0015.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0015.cs" );
verifier.assertFilePresent( "target/" + artifactName + ".dll" );
verifier.assertFilePresent( artifactDir );
verifier.assertFilePresent( metadataDir + "maven-metadata.xml" );
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java
Fri Jan 4 00:22:25 2008
@@ -16,10 +16,10 @@
File testDir =
ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0016-CSharpAssemblyInfoGeneration" );
String assemblyInfoFileName =
- "target/" + BuildDirectories.BUILD_SOURCES.getBuildDirectoryName()
+ "/META-INF/AssemblyInfo.cs";
+ "target/" +
BuildDirectories.BUILD_SOURCES_GENERATED.getBuildDirectoryName() +
"/META-INF/AssemblyInfo.cs";
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0016.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0016.cs" );
verifier.assertFilePresent( assemblyInfoFileName );
verifier.assertFilePresent( "target/NMaven.It.It0016-1.0.0.dll" );
verifier.verifyErrorFreeLog();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java
Fri Jan 4 00:22:25 2008
@@ -17,7 +17,7 @@
ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0017-CSharpStrongNamedAssembly" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0017.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0017.cs" );
verifier.assertFilePresent( "target/NMaven.It.It0017-1.0.0.dll" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java
Fri Jan 4 00:22:25 2008
@@ -42,10 +42,10 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0018.cs" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0018Gen.cs" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() + "/It0018.cs" );
- verifier.assertFilePresent( "target/" +
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() + "/It0018Gen.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.TEST_SOURCES_MAIN.getBuildDirectoryName() + "/It0018.cs" );
+ verifier.assertFilePresent( "target/" +
BuildDirectories.TEST_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -56,8 +56,8 @@
verifier.executeGoal( "install" );
// Verify that the deleted file is purged from the staging compilation
directory
- verifier.assertFileNotPresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0018Gen.cs" );
- verifier.assertFileNotPresent( "target/" +
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() + "/It0018Gen.cs" );
+ verifier.assertFileNotPresent( "target/" +
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
+ verifier.assertFileNotPresent( "target/" +
BuildDirectories.TEST_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
Modified:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AbstractSourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AbstractSourceProcessorMojo.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AbstractSourceProcessorMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AbstractSourceProcessorMojo.java
Fri Jan 4 00:22:25 2008
@@ -126,11 +126,6 @@
}
}
- // Update the scanner to scan the output directory, and rescan
- List<String> outputDirExcludes = new ArrayList<String>(excludeList);
- // Ignore meta-inf, including assembly info
- outputDirExcludes.add( "META-INF/**" );
- directoryScanner.setExcludes( outputDirExcludes.toArray( new String[0]
) );
directoryScanner.setBasedir( outputDirectory );
directoryScanner.scan();
Modified:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
Fri Jan 4 00:22:25 2008
@@ -141,7 +141,7 @@
try
{
File file = new File( project.getBuild().getDirectory(),
BuildDirectories
- .BUILD_SOURCES.getBuildDirectoryName() + File.separator +
"META-INF" + File.separator +
+ .BUILD_SOURCES_GENERATED.getBuildDirectoryName() +
File.separator + "META-INF" + File.separator +
"AssemblyInfo.cs" );
FileUtils.mkdir( file.getParent() );
Modified:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
Fri Jan 4 00:22:25 2008
@@ -45,7 +45,7 @@
protected File getOutputDirectory()
{
return new File( project.getBuild().getDirectory(),
-
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() );
+
BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() );
}
@Override
Modified:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java?rev=608769&r1=608768&r2=608769&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
Fri Jan 4 00:22:25 2008
@@ -51,7 +51,7 @@
protected File getOutputDirectory()
{
return new File( project.getBuild().getDirectory(),
- BuildDirectories.TEST_SOURCES.getBuildDirectoryName()
);
+
BuildDirectories.TEST_SOURCES_MAIN.getBuildDirectoryName() );
}
@Override
