You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/12/21 12:11:12 UTC
svn commit: r1221689 - in
/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl:
CompilerContextImpl.java DefaultNetExecutable.java
DefaultRepositoryNetExecutable.java
Author: lcorneliussen
Date: Wed Dec 21 12:11:11 2011
New Revision: 1221689
URL: http://svn.apache.org/viewvc?rev=1221689&view=rev
Log:
NPANDAY-509: CommandExecutor is confused with MSDeploy-style commandline switches starting with "-" and containing both ":" and "="
o ensure logger in all places / set outside try/catch
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java
Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java?rev=1221689&r1=1221688&r2=1221689&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java Wed Dec 21 12:11:11 2011
@@ -519,6 +519,7 @@ public final class CompilerContextImpl
try
{
CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
+ commandExecutor.setLogger( getLogger() );
String executable = "gacutil";
List<String> commands = new ArrayList<String>();
Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java?rev=1221689&r1=1221688&r2=1221689&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java Wed Dec 21 12:11:11 2011
@@ -98,9 +98,10 @@ public class DefaultNetExecutable
List<String> commands = getCommands();
CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
+ commandExecutor.setLogger( logger );
+
try
{
- commandExecutor.setLogger( logger );
commandExecutor.executeCommand( getExecutable(), commands, getExecutionPath(), true );
}
catch ( ExecutionException e )
Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java?rev=1221689&r1=1221688&r2=1221689&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java Wed Dec 21 12:11:11 2011
@@ -82,9 +82,10 @@ public class DefaultRepositoryNetExecuta
List<String> commands = getCommands();
CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
+ commandExecutor.setLogger( logger );
+
try
{
- commandExecutor.setLogger( logger );
commandExecutor.executeCommand( getExecutable(), getCommands(), getExecutionPath(), true );
}
catch ( ExecutionException e )