svn commit: r560797 - in /incubator/nmaven/trunk: components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ components/dotnet-core/src/main/java/org/apache/maven/dotnet/ componen
Author: sisbell
Date: Sun Jul 29 12:52:22 2007
New Revision: 560797
URL: http://svn.apache.org/viewvc?view=rev&rev=560797
Log:
Support for attahed artifacts (exe.config).
Removed:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetModuleMatchPolicy.java
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/trunk/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test/1.0.0/NMaven.Test-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test2/1.0.0/NMaven.Test2-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test3/1.0.0/NMaven.Test3-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test4/1.0.0/NMaven.Test4-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test5/1.0.0/NMaven.Test5-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven/NMaven.Test6/1.0.0/NMaven.Test6-1.0.0.pom
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryRdfExporterMojo.java
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=560797&r1=560796&r2=560797
==
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
Sun Jul 29 12:52:22 2007
@@ -225,4 +225,25 @@
}
return true;
}
+
+/*
+* Matches .NET module artifacts.
+*
+* @author Shane Isbell
+*/
+private static class NetModuleMatchPolicy
+implements ArtifactMatchPolicy
+{
+
+/**
+ * Matches artifacts of type module
+ *
+ * @param artifact the artifact to match
+ * @return true if artifact is of type module, otherwise returns false.
+ */
+public boolean match( Artifact artifact )
+{
+return artifact.getType().equals( "module" );
+}
+}
}
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=560797&r1=560796&r2=560797
==
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Sun Jul 29 12:52:22 2007
@@ -325,38 +325,48 @@
( ( artifact.getFile() != null ) ?
artifact.getFile().getAbsolutePath() : "" ), e );
}
-MavenXpp3Reader reader = new MavenXpp3Reader();
-Model model;
-try
+if ( !artifact.getType().equals( "exe.config" ) )//TODO: Generalize
for any attached artifact
{
-model = reader.read( new FileReader( pomFile ) );
-}
-
svn commit: r560842 - /incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
Author: sisbell
Date: Sun Jul 29 19:15:11 2007
New Revision: 560842
URL: http://svn.apache.org/viewvc?view=rev&rev=560842
Log:
Fixed issues in the repository builder (for tar files).
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java?view=diff&rev=560842&r1=560841&r2=560842
==
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
Sun Jul 29 19:15:11 2007
@@ -444,7 +444,7 @@
ProjectFactory.createArtifactFrom(
projectDependency, artifactFactory );
artifactDependencies.add( assembly );
artifactDependencies.addAll(
this.storeProjectAndResolveDependencies( projectDependency,
-
null,
+
localRepository,
artifactRepositories ) );
}
}
@@ -478,50 +478,52 @@
}
catch ( TransferFailedException e )
{
-throw new IOException(
-"NMAVEN-000-000a: Problem in resolving
artifact: Assembly Artifact Id = " +
-assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
-e.getMessage() );
+logger.info( "NMAVEN-000-000a: Problem in
resolving artifact: Assembly Artifact Id = " +
+assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
+e.getMessage() );
}
catch ( ResourceDoesNotExistException e )
{
-throw new IOException(
-"NMAVEN-000-000b: Problem in resolving
artifact: Assembly Artifact Id = " +
-assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
-e.getMessage() );
+logger.info( "NMAVEN-000-000b: Problem in
resolving artifact: Assembly Artifact Id = " +
+assembly.getArtifactId() + ", Type = " +
assembly.getType() + ", Message = " +
+e.getMessage() );
}
-FileReader fileReader = new FileReader(
pomArtifact.getFile() );
-
-MavenXpp3Reader reader = new MavenXpp3Reader();
-Model model;
-try
-{
-model = reader.read( fileReader );
-}
-catch ( XmlPullParserException e )
+if ( pomArtifact.getFile() != null &&
pomArtifact.getFile().exists() )
{
-throw new IOException( "NMAVEN-000-000: Unable to
read model: Message = " + e.getMessage() +
-", Path = " +
pomArtifact.getFile().getAbsolutePath() );
+FileReader fileReader = new FileReader(
pomArtifact.getFile() );
-}
-catch ( EOFException e )
-{
-throw new IOException( "NMAVEN-000-000: Unable to
read model: Message = " + e.getMessage() +
-", Path = " +
pomArtifact.getFile().getAbsolutePath() );
-}
+MavenXpp3Reader reader = new MavenXpp3Reader();
+Model model;
+try
+{
+model = reader.read( fileReader );
+}
+catch ( XmlPullParserException e )
+{
+throw new IOException( "NMAVEN-000-000: Unable
to read model: Message = " +
+e.ge
svn commit: r560862 - in /incubator/nmaven/trunk: ./ components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/pl
Author: sisbell
Date: Sun Jul 29 22:03:55 2007
New Revision: 560862
URL: http://svn.apache.org/viewvc?view=rev&rev=560862
Log:
Bug fix for resolvinging of assemblies in the GAC.
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/trunk/maven-dotnet.iml
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Modified:
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java?view=diff&rev=560862&r1=560861&r2=560862
==
---
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
Sun Jul 29 22:03:55 2007
@@ -562,6 +562,11 @@
repositoryConnection.add( did, version,
valueFactory.createLiteral( projectDependency.getVersion() ) );
repositoryConnection.add( did, artifactType,
valueFactory.createLiteral(
projectDependency.getArtifactType() ) );
+if ( projectDependency.getPublicKeyTokenId() != null )
+{
+repositoryConnection.add( did, classifier,
valueFactory.createLiteral(
+projectDependency.getPublicKeyTokenId() + ":" ) );
+}
repositoryConnection.add( id, dependency, did );
}//end for
Modified: incubator/nmaven/trunk/maven-dotnet.iml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?view=diff&rev=560862&r1=560861&r2=560862
==
--- incubator/nmaven/trunk/maven-dotnet.iml (original)
+++ incubator/nmaven/trunk/maven-dotnet.iml Sun Jul 29 22:03:55 2007
@@ -512,15 +512,6 @@
-
-
-
-
-
-
-
-
-
@@ -557,25 +548,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -584,7 +557,7 @@
-
+
@@ -593,7 +566,7 @@
-
+
@@ -602,7 +575,7 @@
-
+
@@ -611,7 +584,7 @@
-
+
@@ -620,7 +593,7 @@
-
+
@@ -629,7 +602,7 @@
-
+
@@ -638,7 +611,7 @@
-
+
@@ -647,7 +620,7 @@
-
+
@@ -656,7 +629,7 @@
-
+
@@ -665,7 +638,7 @@
-
+
@@ -674,7 +647,7 @@
-
+
@@ -683,7 +656,7 @@
-
+
@@ -692,7 +665,7 @@
-
+
@@ -701,7 +674,7 @@
-
+
@@ -710,7 +683,7 @@
-
+
@@ -719,7 +692,7 @@
-
+
Modified:
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=560862&r1=560861&r2=560862
==
---
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Sun Jul 29 22:03:55 2007
@@ -55,
svn commit: r560877 - /incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
Author: sisbell
Date: Sun Jul 29 23:02:14 2007
New Revision: 560877
URL: http://svn.apache.org/viewvc?view=rev&rev=560877
Log:
The repository packager was including the GAC assemblies. Now it does not
include these.
Modified:
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
Modified:
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java?view=diff&rev=560877&r1=560876&r2=560877
==
---
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
Sun Jul 29 23:02:14 2007
@@ -61,6 +61,11 @@
private File localRepository;
/**
+ * @parameter expression="${withGac}"
+ */
+private boolean withGac = false;
+
+/**
* @component
*/
private AssemblyResolver assemblyResolver;
@@ -150,7 +155,7 @@
}
catch ( IOException e )
{
-throw new MojoExecutionException(e.getMessage());
+throw new MojoExecutionException( e.getMessage() );
}
for ( Artifact artifact : (Set)
project.getDependencyArtifacts() )
@@ -168,7 +173,11 @@
try
{
-artifactDeployer.deploy( artifact.getFile(), artifact,
deploymentRepository, localArtifactRepository );
+if ( withGac || !artifact.getType().startsWith( "gac" ) )
+{
+artifactDeployer.deploy( artifact.getFile(), artifact,
deploymentRepository,
+ localArtifactRepository );
+}
//Deploy parent poms
for ( Artifact pomArtifact : pomParentArtifacts )
{
