incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r561247 - in /incubator/nmaven/trunk: ./ components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/ components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/ misc/dotnet-repository-builder/...
Date Tue, 31 Jul 2007 07:05:54 GMT
Author: sisbell
Date: Tue Jul 31 00:05:54 2007
New Revision: 561247

URL: http://svn.apache.org/viewvc?view=rev&rev=561247
Log:
Various

Modified:
    incubator/nmaven/trunk/bootstrap-build.bat
    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.xml
    incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
    incubator/nmaven/trunk/pom.xml

Modified: incubator/nmaven/trunk/bootstrap-build.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/bootstrap-build.bat?view=diff&rev=561247&r1=561246&r2=561247
==============================================================================
--- incubator/nmaven/trunk/bootstrap-build.bat (original)
+++ incubator/nmaven/trunk/bootstrap-build.bat Tue Jul 31 00:05:54 2007
@@ -6,6 +6,7 @@
 IF errorlevel 1 GOTO END
 
 ECHO Installing 3rd Party Assemblies in the Local Repo
+rem call mvn install:install-file -Dfile=./thirdparty/org.apache.ws/XmlSchema-1.1.jar -DpomFile=./thirdparty/org.apache.ws/XmlSchema-1.1.pom
-DgroupId=org.apache.ws.commons -DartifactId=XmlSchema -Dversion=1.1
 call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/NUnit/NUnit.Framework.dll
-DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=library -DartifactVersion=2.2.8.0
 call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/Castle/Castle.Core.dll
-DpomFile=./thirdparty/Castle/Castle.Core-2.0-rc2.pom -DgroupId=Castle -DartifactId=Castle.Core
-Dpackaging=library -DartifactVersion=2.0-rc2
 call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/Castle/Castle.DynamicProxy.dll
-DpomFile=./thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom -DgroupId=Castle -DartifactId=Castle.DynamicProxy
-Dpackaging=library -DartifactVersion=2.0-rc2

Modified: incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java?view=diff&rev=561247&r1=561246&r2=561247
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
(original)
+++ incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImpl.java
Tue Jul 31 00:05:54 2007
@@ -10,11 +10,15 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.openrdf.repository.Repository;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.FileUtils;
@@ -71,7 +75,7 @@
             if ( !project.getArtifactType().equals( "pom" ) )
             {
                 if ( artifact.getFile().exists() )
-                {  
+                {
                     FileUtils.copyFile( artifact.getFile(), new File( mavenRepository, layout.pathOf(
artifact ) ) );
                 }
                 else
@@ -84,11 +88,25 @@
             handler = new DefaultArtifactHandler( "pom" );
             artifact.setArtifactHandler( handler );
 
-            File pomFile = new File( mavenRepository, layout.pathOf( artifact ) );
+            File pomFile = new File( mavenRepository, pathOfPom( artifact ) );
             FileWriter fileWriter = new FileWriter( pomFile );
             new MavenXpp3Writer().write( fileWriter, model );
             IOUtil.close( fileWriter );
         }
         dao.closeConnection();
+    }
+
+    private String pathOfPom( Artifact artifact )
+    {
+        StringBuffer artifactPath = new StringBuffer();
+        for ( String groupId : artifact.getGroupId().split( "[.]" ) )
+        {
+            artifactPath.append( groupId ).append( File.separator );
+        }
+
+        artifactPath.append( artifact.getArtifactId() ).append( File.separator ).append(
artifact.getBaseVersion() ).
+            append( File.separator ).append( artifact.getArtifactId() ).append( "-" ).append(
+            artifact.getBaseVersion() ).append(".").append( ( artifact.getArtifactHandler()
).getExtension() );
+        return artifactPath.toString();
     }
 }

Modified: incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java?view=diff&rev=561247&r1=561246&r2=561247
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
(original)
+++ incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/impl/RepositoryConverterImplTest.java
Tue Jul 31 00:05:54 2007
@@ -73,7 +73,7 @@
         this.exportRepositoryToRdf( "testConvert-rdf.xml", testRepo, repository );
 
         assertTrue( new File( testRepo, "/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0-abc.dll"
).exists() );
-        assertTrue( new File( testRepo, "/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0-abc.pom"
).exists() );
+        assertTrue( new File( testRepo, "/NMaven/Model/NMaven.Model.Pom/1.0/NMaven.Model.Pom-1.0.pom"
).exists() );
         assertTrue( new File( testRepo, "/NMaven/NMaven.Test/1.0/NMaven.Test-1.0.dll" ).exists()
);
         assertTrue( new File( testRepo, "/NMaven/NMaven.Test/1.0/NMaven.Test-1.0.pom" ).exists()
);
     }

Modified: incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml?view=diff&rev=561247&r1=561246&r2=561247
==============================================================================
--- incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml (original)
+++ incubator/nmaven/trunk/misc/dotnet-repository-builder/pom.xml Tue Jul 31 00:05:54 2007
@@ -262,7 +262,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.4</version>
+      <version>1.1</version>
     </dependency>
   </dependencies>
   <build>

Modified: incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?view=diff&rev=561247&r1=561246&r2=561247
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
Tue Jul 31 00:05:54 2007
@@ -136,6 +136,18 @@
         }
         catch ( IOException e )
         {
+            FileOutputStream errorStream;
+            try
+            {
+            errorStream =
+                new FileOutputStream( System.getProperty( "user.home" ) + "\\.m2\\embedder-logs\\error.txt"
);
+                String command = e.getMessage();
+                errorStream.write( command.getBytes() );
+            }
+            catch ( IOException ex )
+            {
+
+            }
             e.printStackTrace();
         }
 

Modified: incubator/nmaven/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?view=diff&rev=561247&r1=561246&r2=561247
==============================================================================
--- incubator/nmaven/trunk/pom.xml (original)
+++ incubator/nmaven/trunk/pom.xml Tue Jul 31 00:05:54 2007
@@ -131,7 +131,7 @@
   <modules>
     <module>components</module>
     <module>archetypes</module>
-    <module>plugins</module>
+    <module>plugins</module> 
   </modules>
   <repositories>
     <repository>
@@ -299,7 +299,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.0.4</version>
+        <version>1.1</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>



Mime
View raw message