Author: eworley
Date: Wed Nov 28 00:52:55 2007
New Revision: 598915
URL: http://svn.apache.org/viewvc?rev=598915&view=rev
Log:
Renaming "Net" classes to "Dotnet" to prevent confusion
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
- copied, changed from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
- copied, changed from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
- copied, changed from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
- copied, changed from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java
Removed:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java
Copied:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
(from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java)
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java&r1=598911&r2=598915&rev=598915&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
Wed Nov 28 00:52:55 2007
@@ -2,7 +2,7 @@
import java.io.File;
-public interface NetCompilerConfig
+public interface DotnetCompilerConfig
extends CompilerConfig
{
@@ -20,9 +20,9 @@
*/
void setKeyInfo( KeyInfo keyInfo );
- NetCompilerPlatformVersion getCompilerPlatformVersion();
+ DotnetCompilerPlatformVersion getCompilerPlatformVersion();
- void setCompilerPlatformVersion( NetCompilerPlatformVersion
compilerPlatformVersion );
+ void setCompilerPlatformVersion( DotnetCompilerPlatformVersion
compilerPlatformVersion );
public static class Factory
{
@@ -38,13 +38,13 @@
*
* @return a default instance of the executable config
*/
- public static NetCompilerConfig createDefaultExecutableConfig()
+ public static DotnetCompilerConfig createDefaultExecutableConfig()
{
- return new NetCompilerConfig()
+ return new DotnetCompilerConfig()
{
private KeyInfo keyInfo;
- private NetCompilerPlatformVersion compilerPlatformVersion;
+ private DotnetCompilerPlatformVersion compilerPlatformVersion;
private ArtifactType artifactType;
@@ -70,12 +70,12 @@
this.keyInfo = keyInfo;
}
- public NetCompilerPlatformVersion getCompilerPlatformVersion()
+ public DotnetCompilerPlatformVersion
getCompilerPlatformVersion()
{
return compilerPlatformVersion;
}
- public void setCompilerPlatformVersion(
NetCompilerPlatformVersion compilerPlatformVersion )
+ public void setCompilerPlatformVersion(
DotnetCompilerPlatformVersion compilerPlatformVersion )
{
this.compilerPlatformVersion = compilerPlatformVersion;
}
@@ -205,7 +205,7 @@
return false;
}
- final NetCompilerConfig that = (NetCompilerConfig) o;
+ final DotnetCompilerConfig that = (DotnetCompilerConfig) o;
if ( isTestCompile != that.isTestCompile() )
{
Copied:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
(from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java)
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java&r1=598911&r2=598915&rev=598915&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
Wed Nov 28 00:52:55 2007
@@ -5,7 +5,7 @@
import java.io.File;
import java.util.Set;
-public interface NetCompilerContext extends CompilerContext
+public interface DotnetCompilerContext extends CompilerContext
{
/**
Copied:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
(from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java)
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java&r1=598911&r2=598915&rev=598915&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
Wed Nov 28 00:52:55 2007
@@ -1,6 +1,6 @@
package org.apache.maven.dotnet.compiler;
-public enum NetCompilerPlatformVersion
+public enum DotnetCompilerPlatformVersion
{
VERSION_1_1_4322("1.1.4322"),
VERSION_2_0_50727("2.0.50727"),
@@ -9,7 +9,7 @@
private String version;
- NetCompilerPlatformVersion(String version)
+ DotnetCompilerPlatformVersion(String version)
{
this.version = version;
}
Copied:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
(from r598911,
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java&r1=598911&r2=598915&rev=598915&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
Wed Nov 28 00:52:55 2007
@@ -1,21 +1,23 @@
package org.apache.maven.dotnet.compiler.impl;
-import org.apache.maven.dotnet.compiler.*;
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.dotnet.compiler.Compiler;
import org.apache.maven.dotnet.compiler.CompilerConfig;
+import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
+import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
+import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
import org.apache.maven.dotnet.compiler.PlatformUnsupportedException;
-import org.apache.maven.artifact.Artifact;
+import org.apache.maven.dotnet.compiler.Vendor;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
-import java.util.Set;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.io.File;
-
-public class NetCompilerContextImpl
- implements NetCompilerContext
+public class DotnetCompilerContextImpl
+ implements DotnetCompilerContext
{
@@ -24,7 +26,7 @@
*/
private MavenProject project;
- private NetCompilerConfig netCompilerConfig;
+ private DotnetCompilerConfig netCompilerConfig;
private Set<Artifact> libraryDependencies;
@@ -115,7 +117,7 @@
}
this.project = project;
- this.netCompilerConfig = (NetCompilerConfig) compilerConfig;
+ this.netCompilerConfig = (DotnetCompilerConfig) compilerConfig;
netCompilerConfig.verifyCompilerConfig();
libraryDependencies = new HashSet<Artifact>();
@@ -140,12 +142,12 @@
String gacRoot = null;
if ( netCompilerConfig.getVendor().equals(
Vendor.MICROSOFT ) &&
(
netCompilerConfig.getCompilerPlatformVersion().compareTo(
- NetCompilerPlatformVersion.VERSION_2_0_50727 ) >=
0 ) )
+ DotnetCompilerPlatformVersion.VERSION_2_0_50727 )
>= 0 ) )
{
gacRoot = System.getenv( "SystemRoot" ) +
"\\assembly\\GAC_MSIL\\";
}
else if ( netCompilerConfig.getVendor().equals(
Vendor.MICROSOFT ) &&
- netCompilerConfig.equals(
NetCompilerPlatformVersion.VERSION_1_1_4322 ) )
+ netCompilerConfig.equals(
DotnetCompilerPlatformVersion.VERSION_1_1_4322 ) )
{
gacRoot = System.getenv( "SystemRoot" ) +
"\\assembly\\GAC\\";
}
