svn commit: r560896 - in /incubator/nmaven/trunk: components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/

2007-07-30 Thread sisbell 
Author: sisbell
Date: Mon Jul 30 02:09:36 2007
New Revision: 560896

URL: http://svn.apache.org/viewvc?view=rev&rev=560896
Log:
Added resolving for artifacts that have classifiers.

Modified:

incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java

incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java

incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java

incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
incubator/nmaven/trunk/misc/dotnet-repository-builder/pom-dotnet.xml

Modified: 
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java?view=diff&rev=560896&r1=560895&r2=560896
==
--- 
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
 (original)
+++ 
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectFactory.java
 Mon Jul 30 02:09:36 2007
@@ -97,22 +97,23 @@
 return projectDependency;
 }
 
-public static Dependency createDependencyFrom(ProjectDependency 
projectDependency)
+public static Dependency createDependencyFrom( ProjectDependency 
projectDependency )
 {
 Dependency dependency = new Dependency();
-dependency.setGroupId( projectDependency.getGroupId());
-dependency.setArtifactId( projectDependency.getArtifactId());
-dependency.setVersion( projectDependency.getVersion());
-dependency.setType( projectDependency.getArtifactType());
-dependency.setClassifier( projectDependency.getPublicKeyTokenId());
+dependency.setGroupId( projectDependency.getGroupId() );
+dependency.setArtifactId( projectDependency.getArtifactId() );
+dependency.setVersion( projectDependency.getVersion() );
+dependency.setType( projectDependency.getArtifactType() );
+dependency.setClassifier( projectDependency.getPublicKeyTokenId() );
 return dependency;
 }
 
 public static Artifact createArtifactFrom( Project project, 
ArtifactFactory artifactFactory, File localRepository )
 {
-Artifact assembly = artifactFactory.createArtifact( 
project.getGroupId(), project.getArtifactId(),
-
project.getVersion(), "compile",
-
project.getArtifactType() );
+Artifact assembly = artifactFactory.createArtifactWithClassifier( 
project.getGroupId(), project.getArtifactId(),
+  
project.getVersion(),
+  
project.getArtifactType(),
+  
project.getPublicKeyTokenId() );
 
 File artifactFile = ( ( project.getArtifactType().startsWith( "gac" ) 
) ) ? new File(
 "C:\\WINDOWS\\assembly\\" + project.getArtifactType() + "\\" + 
project.getArtifactId() + "\\" +
@@ -135,7 +136,7 @@
   
projectDependency.getArtifactType(),
   
projectDependency.getPublicKeyTokenId(), scope,
   null );
-
+//System.out.println("Scope = " + assembly.getScope() + ", Type = " + 
assembly.getType() + ", Classifier = " + assembly.getClassifier());
 File artifactFile = ( ( 
projectDependency.getArtifactType().startsWith( "gac" ) ) ) ? new File(
 "C:\\WINDOWS\\assembly\\" + projectDependency.getArtifactType() + 
"\\" + projectDependency.getArtifactId() +
 "\\" + projectDependency.getVersion() + "__" + 
projectDependency.getPublicKeyTokenId() + "\\" +

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=560896&r1=560895&r2=560896
==
--- 
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

svn commit: r561095 - in /incubator/nmaven/trunk: ./ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifac

2007-07-30 Thread sisbell 
Author: sisbell
Date: Mon Jul 30 12:06:24 2007
New Revision: 561095

URL: http://svn.apache.org/viewvc?view=rev&rev=561095
Log:
Fixes for packaging of repo tar. Fixed incorrect versions of plexus in WAR file 
that caused the IDE builds to break.

Modified:

incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java

incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml

incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java

incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java

incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
incubator/nmaven/trunk/pom.xml

Modified: 
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=561095&r1=561094&r2=561095
==
--- 
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
 (original)
+++ 
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
 Mon Jul 30 12:06:24 2007
@@ -75,7 +75,8 @@
 void installFileWithoutPom( String groupId, String artifactId, String 
version, String packaging, File artifactFile )
 throws ArtifactInstallationException;
 
-void resolveAndInstallNetDependenciesForProfile( String profile, 
List dependencies )
+void resolveAndInstallNetDependenciesForProfile( String profile, 
List dependencies,
+ List 
javaDependencies )
 throws IOException;
 
 void installArtifactAndDependenciesIntoPrivateApplicationBase( File 
applicationBase, Artifact artifact,

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=561095&r1=561094&r2=561095
==
--- 
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
 Mon Jul 30 12:06:24 2007
@@ -145,21 +145,27 @@
 this.logger = logger;
 }
 
-public void resolveAndInstallNetDependenciesForProfile( String profile, 
List dependencies )
+public void resolveAndInstallNetDependenciesForProfile( String profile, 
List netDependencies,
+List 
javaDependencies )
 throws IOException
 {
-if ( dependencies == null )
+if ( netDependencies == null )
 {
-dependencies = new ArrayList();
+netDependencies = new ArrayList();
+}
+
+if ( javaDependencies == null )
+{
+javaDependencies = new ArrayList();
 }
 
 NetDependenciesRepository repository =
 (NetDependenciesRepository) repositoryRegistry.find( 
"net-dependencies" );
 List matchPolicies = new 
ArrayList();
 matchPolicies.add( new ProfileMatchPolicy( profile ) );
-dependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
+netDependencies.addAll( repository.getDependenciesFor( matchPolicies ) 
);
 
-assemblyResolver.resolveTransitivelyFor( new MavenProject(), 
dependencies, remoteArtifactRepositories,
+assemblyResolver.resolveTransitivelyFor( new MavenProject(), 
netDependencies, remoteArtifactRepositories,
  localRepository, false );
 
 //Do Library Installs for Net Dependencies
@@ -167,15 +173,16 @@
 matchPolicies.add( new ProfileMatchPolicy( profile ) );
 matchPolicies.add( new ExecutableAndNetPluginAndAddinMatchPolicy() );
 
-for ( Dependency dependency : dependencies )
+ArtifactRepository localArtifactRepo =
+new DefaultArtifactRepository( "local", "file://" + 
localRepository, new DefaultRepositoryLayout() );
+
+for ( Dependency dependency : netDependencies )
 {
 Artifact