You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/05/13 17:52:41 UTC
svn commit: r537620 - in /incubator/nmaven/branches/SI_XPT: ./
assemblies/NMaven.Core/src/main/csharp/Core/Impl/
components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/
components/dotnet-assembler/src/main/java/org/apache/maven/...
Author: sisbell
Date: Sun May 13 10:52:41 2007
New Revision: 537620
URL: http://svn.apache.org/viewvc?view=rev&rev=537620
Log:
Some minor bug fixes: Deploy fix that cause the assemblies to be corrupt; fixed embedding copyrights into assembly (largely formatting), fixed exe.config resolve problem
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=537620&r1=537619&r2=537620
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs Sun May 13 10:52:41 2007
@@ -348,8 +348,7 @@
}
}
return dependencies;
- }
-
+ }
}
}
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=537620&r1=537619&r2=537620
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Sun May 13 10:52:41 2007
@@ -206,17 +206,17 @@
}
//End GAC HACK
- if ( configExeFile.exists() && !artifact.getType().equals( ArtifactType.EXECONFIG.getPackagingType() ) )
+ if ( configExeFile.exists() )
{
logger.info( "NMAVEN-002-000: Found config executable: File = " + configExeFile.getAbsolutePath() );
- Dependency dependency = new Dependency();
- dependency.setArtifactId( project.getArtifactId() );
- dependency.setGroupId( project.getGroupId() );
- dependency.setVersion( project.getVersion().replace( "-SNAPSHOT", "" ) );
- dependency.setType( "exe.config" );
- dependency.setScope( Artifact.SCOPE_RUNTIME );
+ Dependency configExeDependency = new Dependency();
+ configExeDependency.setArtifactId( project.getArtifactId() );
+ configExeDependency.setGroupId( project.getGroupId() );
+ configExeDependency.setVersion( project.getVersion() );
+ configExeDependency.setType( "exe.config" );
+ configExeDependency.setScope( Artifact.SCOPE_RUNTIME );
List<Dependency> dep = new ArrayList<Dependency>();
- dep.add( dependency );
+ dep.add( configExeDependency);
project.setDependencies( dep );
artifact.getMetadataList().clear();
try
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?view=diff&rev=537620&r1=537619&r2=537620
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java Sun May 13 10:52:41 2007
@@ -108,7 +108,7 @@
try
{
fis = new FileInputStream( file );
- copyright = IOUtil.toString( fis ).replace( "\r", "" ).replace( "\n", "" ).replace( "\"", "\\" );
+ copyright = IOUtil.toString( fis ).replace( "\r", " " ).replace( "\n", " " ).replace( "\"", "'" );
}
catch ( IOException e )
{
Modified: incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/maven-dotnet.iml?view=diff&rev=537620&r1=537619&r2=537620
==============================================================================
--- incubator/nmaven/branches/SI_XPT/maven-dotnet.iml (original)
+++ incubator/nmaven/branches/SI_XPT/maven-dotnet.iml Sun May 13 10:52:41 2007
@@ -544,6 +544,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/mortbay/jetty/jetty-util/6.1.3/jetty-util-6.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java?view=diff&rev=537620&r1=537619&r2=537620
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java Sun May 13 10:52:41 2007
@@ -1,8 +1,5 @@
package org.apache.maven.dotnet.plugins;
-import java.io.File;
-
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeployer;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -45,16 +42,10 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
-
- // Is snapshot or regular repo depending on project version
- ArtifactRepository deployRepo = project.getDistributionManagementArtifactRepository();
-
- Artifact artifact = project.getArtifact();
- File sourceFile = project.getFile();
-
try
{
- artifactDeployer.deploy( sourceFile, artifact, deployRepo, localRepo );
+ artifactDeployer.deploy( project.getArtifact().getFile(), project.getArtifact(),
+ project.getDistributionManagementArtifactRepository(), localRepo );
}
catch ( ArtifactDeploymentException e )
{