incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r603468 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: ./ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/ archetypes/maven-archetype-dotnet-simple/src/main/resources/arc...
Date Wed, 12 Dec 2007 05:44:44 GMT
Author: sisbell
Date: Tue Dec 11 21:44:43 2007
New Revision: 603468

URL: http://svn.apache.org/viewvc?rev=603468&view=rev
Log:
Merged over changes from trunk: rev. 594585.

Modified:
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Model/Pom/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Plugin/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/pom.xml
Tue Dec 11 21:44:43 2007
@@ -9,6 +9,5 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>org.apache.maven.dotnet</groupId>  
   <artifactId>maven-archetype-dotnet-simple</artifactId>  
-  <packaging>maven-plugin</packaging>  
   <name>maven-archetype-dotnet-simple</name> 
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/META-INF/archetype.xml
Tue Dec 11 21:44:43 2007
@@ -2,5 +2,6 @@
   <id>maven-archetype-dotnet-simple</id>
   <resources>
     <resource>src/main/csharp/Sample/MyApp.cs</resource>
+    <resource>src/test/csharp/Sample/MyAppTest.cs</resource>    
   </resources>
 </archetype>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-dotnet-simple/src/main/resources/archetype-resources/pom.xml
Tue Dec 11 21:44:43 2007
@@ -4,8 +4,16 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>${groupId}</groupId>  
   <artifactId>${artifactId}</artifactId>  
-  <version>0.14-incubating-SNAPSHOT</version>  
-  <packaging>library</packaging>  
+  <version>${version}</version>
+  <packaging>library</packaging>
+    <dependencies>
+    <dependency>
+      <groupId>NUnit</groupId>
+      <artifactId>NUnit.Framework</artifactId>
+      <version>2.2.8.0</version>
+      <type>library</type>
+    </dependency>
+  </dependencies>  
   <build> 
     <sourceDirectory>src/main/csharp</sourceDirectory>  
     <testSourceDirectory>src/test/csharp</testSourceDirectory>  
@@ -14,7 +22,7 @@
         <groupId>org.apache.maven.dotnet.plugins</groupId>  
         <artifactId>maven-compile-plugin</artifactId>  
         <extensions>true</extensions> 
-      </plugin> 
+      </plugin>
     </plugins> 
   </build> 
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/archetypes/maven-archetype-netexecutable/pom.xml
Tue Dec 11 21:44:43 2007
@@ -9,6 +9,5 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>org.apache.maven.dotnet</groupId>  
   <artifactId>maven-archetype-netexecutable</artifactId>  
-  <packaging>maven-plugin</packaging>  
   <name>maven-archetype-netexecutable</name> 
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Model/Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Model/Pom/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Model/Pom/pom.xml Tue
Dec 11 21:44:43 2007
@@ -63,6 +63,13 @@
           <isGacInstall>true</isGacInstall> 
         </configuration> 
       </plugin> 
+      <plugin> 
+        <groupId>org.apache.maven.dotnet.plugins</groupId>  
+        <artifactId>maven-deploy-plugin</artifactId>  
+        <configuration> 
+          <classifier>4b435f4d76e2f0e6</classifier>
+        </configuration> 
+      </plugin> 
     </plugins> 
   </build> 
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Plugin/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.Plugin/pom.xml Tue Dec
11 21:44:43 2007
@@ -56,6 +56,13 @@
           <isGacInstall>true</isGacInstall> 
         </configuration> 
       </plugin> 
+      <plugin> 
+        <groupId>org.apache.maven.dotnet.plugins</groupId>  
+        <artifactId>maven-deploy-plugin</artifactId>  
+        <configuration> 
+          <classifier>4b435f4d76e2f0e6</classifier>
+        </configuration> 
+      </plugin> 
     </plugins> 
   </build> 
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/AddArtifactsForm.cs
Tue Dec 11 21:44:43 2007
@@ -145,10 +145,16 @@
         {
             String pomFileName = 
                 (new FileInfo(project.FileName).Directory).FullName + @"\pom.xml";
-            if (!new FileInfo(pomFileName).Exists)
+            if (!new FileInfo(pomFileName).Exists)//No flat directory structure.
             {
-                MessageBox.Show("Could not add reference. Missing pom file: File = " + pomFileName);
-                return;
+                pomFileName = (new FileInfo(project.FileName).Directory.Parent.Parent.Parent).FullName

+                    + @"\pom.xml";
+
+                if (!new FileInfo(pomFileName).Exists)
+                {
+                    MessageBox.Show("Could not add reference. Missing pom file: File = "
+ pomFileName);
+                    return;
+                }
             }
 
             XmlReader reader = XmlReader.Create(pomFileName);

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
Tue Dec 11 21:44:43 2007
@@ -55,7 +55,12 @@
     private org.openrdf.repository.Repository rdfRepository;
 
     private File dataDir;
+        //Disable this test due to a compilation error in the wagon manager test stub
+    public void testBogus()
+    {
 
+    }
+/*
     public void testGetAllProjects()
     {
         ProjectDao dao = this.createProjectDao();
@@ -88,17 +93,7 @@
             e.printStackTrace();
             fail( "Could not retrieve the project: " + e.getMessage() );
         }
-        /*
-        assertEquals("Incorrect Number of Projects", 3, projects.size());
 
-        for(Project proj : projects)
-        {
-            if(proj.getArtifactId().equals( "NMaven.Test5"))
-            {
-                assertEquals("Incorrect number of dependencies", 2, proj.getProjectDependencies().size());
-            }
-        }
-        */
         dao.closeConnection();
     }
 
@@ -237,56 +232,8 @@
                     this.hasDependency( "NMaven", "NMaven.Test4", "1.0.0", projectDependencies
) );
         dao.closeConnection();
     }
-              /*
-    public void testStoreTransitiveDependency()
-    {
-        ProjectDao dao = this.createProjectDao();
-
-        Project project = new Project();
-        project.setGroupId( "NMaven" );
-        project.setArtifactId( "NMaven.Test" );
-        project.setVersion( "1.0.0" );
-        project.setArtifactType( "library" );
-        ProjectDependency test2 = createProjectDependency( "NMaven", "NMaven.Test2", "1.0.0"
);
-        project.addProjectDependency( test2 );
-        Set<Artifact> artifacts = null;
-
-        try
-        {
-            artifacts =
-                dao.storeProjectAndResolveDependencies( project, localRepository, new ArrayList<ArtifactRepository>()
);
-        }
-        catch ( java.io.IOException e )
-        {
-            e.printStackTrace();
-            fail( "Could not store the project: " + e.getMessage() );
-        }
-     //   assertEquals( "Incorrect number of returned artifacts", 3, artifacts.size() );
 
-        this.exportRepositoryToRdf( "testStoreTransitiveDependency-rdf.xml" );
 
-        Project testProject = null;
-        try
-        {
-            testProject = dao.getProjectFor( "NMaven", "NMaven.Test", "1.0.0", "library",
null );
-        }
-        catch ( IOException e )
-        {
-            e.printStackTrace();
-            fail( "Could not retrieve the project: " + e.getMessage() );
-        }
-
-        Set<ProjectDependency> projectDependencies =
-            ( (ProjectDependency) testProject.getProjectDependencies().toArray()[0] ).getProjectDependencies();
-        assertEquals( "Incorrect number of dependencies", 1, projectDependencies.size() );
-
-        ProjectDependency projectDependency = (ProjectDependency) projectDependencies.toArray()[0];
-        assertTrue( "Could not find required dependency. Found Dependency: GroupId = " +
-            projectDependency.getGroupId() + ", Artifact Id = " + projectDependency.getArtifactId(),
-                    this.hasDependency( "NMaven", "NMaven.Test3", "1.0.0", projectDependencies
) );
-        dao.closeConnection();
-    }
-             */
     public void testSingleStore()
     {
         ProjectDao dao = this.createProjectDao();
@@ -419,4 +366,5 @@
             e.printStackTrace();
         }
     }
+    */
 }

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
Tue Dec 11 21:44:43 2007
@@ -44,10 +44,15 @@
 import java.io.IOException;
 
 public class WagonManagerTestStub
-    implements WagonManager
+   // implements WagonManager
 {
 
     private File basedir;
+
+    public void addAuthenticationCredentials(String s, String s2, String s3 , String s4 ,String
s5)
+    {
+
+    }
 
     public Wagon getWagon( String string )
         throws UnsupportedProtocolException

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
Tue Dec 11 21:44:43 2007
@@ -125,9 +125,16 @@
                 artifact.setArtifactHandler( pomhandler );
 
                 File pomFile = new File( mavenRepository, pathOfPom( artifact ) );
+                pomFile.getParentFile().mkdirs();
                 FileWriter fileWriter = new FileWriter( pomFile );
-                new MavenXpp3Writer().write( fileWriter, model );
-                IOUtil.close( fileWriter );
+                try
+                {
+                    new MavenXpp3Writer().write( fileWriter, model );
+                }
+                finally
+                {
+                    IOUtil.close( fileWriter );
+                }
             }
             artifact.setArtifactHandler( handler );
         }

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
Tue Dec 11 21:44:43 2007
@@ -76,6 +76,13 @@
     private String packaging;
 
     /**
+     * The project classifier type
+     *
+     * @parameter
+     */
+    private String classifier;
+
+    /**
      * @component
      */
     private ArtifactFactory artifactFactory;
@@ -103,6 +110,22 @@
             try
             {
                 artifactDeployer.deploy( exePath, attachedArtifact,
+                                         project.getDistributionManagementArtifactRepository(),
localRepo );
+            }
+            catch ( ArtifactDeploymentException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-DEPLOY: Deploy Failed", e );
+            }
+        }
+
+        if ( classifier != null )
+        {
+            Artifact attachedArtifact = artifactFactory.createArtifactWithClassifier( projectArtifact.getGroupId(),
+                                                                        projectArtifact.getArtifactId(),
+                                                                        project.getVersion(),
packaging, classifier );
+            try
+            {
+                artifactDeployer.deploy( project.getArtifact().getFile(), attachedArtifact,
                                          project.getDistributionManagementArtifactRepository(),
localRepo );
             }
             catch ( ArtifactDeploymentException e )

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
Tue Dec 11 21:44:43 2007
@@ -158,7 +158,7 @@
         }
         catch ( IOException e )
         {
-            throw new MojoExecutionException("NMAVEN-1700-008: Message = " +  e.getMessage()
);
+            throw new MojoExecutionException("NMAVEN-1700-008: Message = " +  e.getMessage(),
e );
         }
     }
 

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml?rev=603468&r1=603467&r2=603468&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml Tue Dec 11 21:44:43 2007
@@ -231,7 +231,7 @@
     </dependency> 
   </dependencies>  
   <properties> 
-    <mavenVersion>2.1-SNAPSHOT</mavenVersion>  
+    <mavenVersion>2.0.8</mavenVersion>  
     <jettyVersion>6.1.5</jettyVersion>  
     <xfireVersion>1.2.5</xfireVersion> 
   </properties>  



Mime
View raw message