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/03/25 14:06:21 UTC
svn commit: r1085382 -
/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Author: lcorneliussen
Date: Fri Mar 25 14:06:20 2011
New Revision: 1085382
URL: http://svn.apache.org/viewvc?rev=1085382&view=rev
Log:
[NPANDAY-123] reverted r1084495 - needs a different take
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java?rev=1085382&r1=1085381&r2=1085382&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java (original)
+++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java Fri Mar 25 14:06:20 2011
@@ -419,18 +419,11 @@ public class NetExecutableFactoryImpl
executableRequirement.setProfile( profile );
ExecutableConfig executableConfig = ExecutableConfig.Factory.createDefaultExecutableConfig();
-
- executableConfig.setCommands( commands );
+ executableConfig.setCommands( commands );
List<String> executablePaths = ( executableConfig.getExecutionPaths() == null ) ? new ArrayList<String>()
: executableConfig.getExecutionPaths();
-
- if (netHome == null)
- {
- netHome = getNetHome();
- }
-
- if ( netHome != null )
+ if ( netHome != null )
{
logger.info( "NPANDAY-066-014: Found executable path in pom: Path = " + netHome.getAbsolutePath() );
executablePaths.add( netHome.getAbsolutePath() );
@@ -462,34 +455,4 @@ public class NetExecutableFactoryImpl
throw new PlatformUnsupportedException( "NPANDAY-066-001: Unable to find net executable", e );
}
}
-
- private File getNetHome()
- {
- String nHome = "";
-
- // 32 bit system
- if( new File("C:/Program Files/Microsoft SDKs/Windows/v6.0A/bin/gacutil.exe").exists() && new File("C:/Program Files/Microsoft SDKs/Windows/v6.0A/bin/xsd.exe").exists() )
- {
- nHome = "C:/Program Files/Microsoft SDKs/Windows/v6.0A/bin";
- }
- if( new File("C:/Program Files/Microsoft SDKs/Windows/v7.0A/bin/gacutil.exe").exists() && new File("C:/Program Files/Microsoft SDKs/Windows/v7.0A/bin/xsd.exe").exists() )
- {
- nHome = "C:/Program Files/Microsoft SDKs/Windows/v7.0A/bin";
- }
-
- // 64 bit system
- if ( nHome != "" )
- {
- if( new File("C:/Program Files (x86)/Microsoft SDKs/Windows/v6.0A/bin/gacutil.exe").exists() && new File("C:/Program Files (x86)/Microsoft SDKs/Windows/v6.0A/bin/xsd.exe").exists() )
- {
- nHome = "C:/Program Files/Microsoft SDKs/Windows/v6.0A/bin";
- }
- if( new File("C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/bin/gacutil.exe").exists() && new File("C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/bin/xsd.exe").exists() )
- {
- nHome = "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/bin";
- }
- }
-
- return new File(nHome);
- }
}