svn commit: r488759 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/ integration-tests/tests/it0022/ plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r488759 - in /incubator/nmaven/branches/SI_SIGNING: components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/ integration-tests/tests/it0022/ plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/...

sisbell
Author: sisbell
Date: Tue Dec 19 10:51:34 2006
New Revision: 488759

URL: http://svn.apache.org/viewvc?view=rev&rev=488759
Log:
Fixed a signing bug for framework v1.1

Modified:
    incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
    incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java

Modified: incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java?view=diff&rev=488759&r1=488758&r2=488759
==============================================================================
--- incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java (original)
+++ incubator/nmaven/branches/SI_SIGNING/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java Tue Dec 19 10:51:34 2006
@@ -31,6 +31,7 @@
 import java.io.InputStreamReader;
 
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
 
 /**
  * Provides services for writing out the AssemblyInfo entries using the bracket convention [assembly:
@@ -68,7 +69,7 @@
             .append( createEntry( "Configuration", assemblyInfo.getConfiguration() ) );
             if(assemblyInfo.getKeyName() != null) sb.append( createEntry( "KeyName", assemblyInfo.getKeyName() ) );
             if(assemblyInfo.getKeyFile() != null)
-                sb.append(createEntry("KeyFile", assemblyInfo.getKeyFile().getAbsolutePath()));
+                sb.append(createEntry("KeyFile", assemblyInfo.getKeyFile().getAbsolutePath().replace( "\\", "\\\\")));
         FileOutputStream man = null;
         try
         {

Modified: incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml?view=diff&rev=488759&r1=488758&r2=488759
==============================================================================
--- incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml (original)
+++ incubator/nmaven/branches/SI_SIGNING/integration-tests/tests/it0022/pom.xml Tue Dec 19 10:51:34 2006
@@ -1,10 +1,10 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.it</groupId>
-  <artifactId>it0020</artifactId>
+  <artifactId>it0022</artifactId>
   <packaging>library</packaging>
   <version>1.0.0</version>
-  <name>it0020</name>
+  <name>it0022</name>
 
   <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>

Modified: incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java?view=diff&rev=488759&r1=488758&r2=488759
==============================================================================
--- incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_SIGNING/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java Tue Dec 19 10:51:34 2006
@@ -184,6 +184,7 @@
 
         if ( vendorInfo.getVendor().equals( Vendor.MICROSOFT ) && vendorInfo.getVendorVersion().equals( "1.1.4322" ) )
         {
+            System.out.println(keyfile + ":" + keycontainer);
             assemblyInfo.setKeyFile( keyfile );
             assemblyInfo.setKeyName( keycontainer );
         }