Author: sisbell
Date: Tue Dec 4 13:01:21 2007
New Revision: 601084
URL: http://svn.apache.org/viewvc?rev=601084&view=rev
Log:
Extracted out core classes into separate package/module and fixed maven build
and poms.
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/pom.xml
(with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
(with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
(with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
(with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
(with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
(with props)
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
(with props)
Removed:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/resources/
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ArtifactType.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/PlatformUnsupportedException.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ProgrammingLanguage.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/Vendor.java
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/pom.xml
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler-ext/src/main/java/org/apache/maven/dotnet/compiler/ext/CSharpClassCompiler.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/pom.xml
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/pom.xml
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/pom.xml?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/pom.xml
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/pom.xml
Tue Dec 4 13:01:21 2007
@@ -18,40 +18,37 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-incubating-SNAPSHOT</version>
- <artifactId>dotnet-components</artifactId>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>dotnet-assembler</artifactId>
- <name>dotnet-assembler</name>
- <description>NMaven</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>dotnet-model-assembly-plugins</artifactId>
- <version>0.14-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>dotnet-artifact</artifactId>
- <version>0.14-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>dotnet-core</artifactId>
- <version>0.14-incubating-SNAPSHOT</version>
- </dependency>
- </dependencies>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <version>0.14-incubating-SNAPSHOT</version>
+ <artifactId>dotnet-components</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-assembler</artifactId>
+ <name>dotnet-assembler</name>
+ <description>dotnet-assembler</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-alpha-32</version>
+ </dependency>
+ </dependencies>
</project>
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
Tue Dec 4 13:01:21 2007
@@ -19,7 +19,7 @@
package org.apache.maven.dotnet.assembler;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
+import org.apache.maven.dotnet.ProgrammingLanguage;
/**
* Provides services for generating of AssemblyInfo.* file.
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
Tue Dec 4 13:01:21 2007
@@ -18,7 +18,7 @@
*/
package org.apache.maven.dotnet.assembler;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
+import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
import java.io.IOException;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshallerAnnotation.java
Tue Dec 4 13:01:21 2007
@@ -1,6 +1,6 @@
package org.apache.maven.dotnet.assembler;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
+import org.apache.maven.dotnet.ProgrammingLanguage;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
Tue Dec 4 13:01:21 2007
@@ -23,8 +23,8 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfoException;
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshallerAnnotation;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
-import org.apache.maven.dotnet.compiler.BuildDirectories;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.BuildDirectories;
import org.apache.maven.project.MavenProject;
import org.apache.maven.model.Organization;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
Tue Dec 4 13:01:21 2007
@@ -20,8 +20,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
-import org.apache.maven.dotnet.compiler.BuildDirectories;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
+import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
import java.io.IOException;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
Tue Dec 4 13:01:21 2007
@@ -20,7 +20,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
+import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
import java.io.IOException;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
Tue Dec 4 13:01:21 2007
@@ -20,7 +20,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
+import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
import java.io.IOException;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler-ext/src/main/java/org/apache/maven/dotnet/compiler/ext/CSharpClassCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler-ext/src/main/java/org/apache/maven/dotnet/compiler/ext/CSharpClassCompiler.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler-ext/src/main/java/org/apache/maven/dotnet/compiler/ext/CSharpClassCompiler.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler-ext/src/main/java/org/apache/maven/dotnet/compiler/ext/CSharpClassCompiler.java
Tue Dec 4 13:01:21 2007
@@ -14,8 +14,8 @@
import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
import org.apache.maven.dotnet.compiler.InvalidArtifactException;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
-import org.apache.maven.dotnet.compiler.Vendor;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
@CompilerAnnotation(programmingLanguaqe = ProgrammingLanguage.C_SHARP,
vendors = {Vendor.MICROSOFT, Vendor.NOVELL, Vendor.ANY},
@@ -48,7 +48,7 @@
Set<Artifact> references = compilerContext.getLibraryDependencies();
Set<Artifact> modules = compilerContext.getDirectModuleDependencies();
- File sourceDirectory = config.getSourceDirectory();
+ File sourceDirectory = config.getCompilerDirectory();
compiledArtifact =
new File( config.getTargetDirectory(),
compilerContext.getCompilerConfig().getArtifactFileName() );
String targetArtifactType =
config.getArtifactType().getTargetCompileType();
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/pom.xml?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/pom.xml
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/pom.xml
Tue Dec 4 13:01:21 2007
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerAnnotation.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
Tue Dec 4 13:01:21 2007
@@ -1,5 +1,8 @@
package org.apache.maven.dotnet.compiler;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
Tue Dec 4 13:01:21 2007
@@ -1,5 +1,9 @@
package org.apache.maven.dotnet.compiler;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
+import org.apache.maven.dotnet.ArtifactType;
+
import java.io.File;
public interface CompilerConfig
@@ -46,7 +50,7 @@
*/
void setLocalRepository( File localRepository );
- void setSourceDirectory( File sourceDirectory );
+ void setCompilerSourceDirectory( File sourceDirectory );
/**
* Returns the source directory (or test source directory) path of the
class files. These are defined in the pom.xml
@@ -54,7 +58,7 @@
*
* @return the source directory (or test source directory) path of the
class files.
*/
- File getSourceDirectory();
+ File getCompilerDirectory();
void setTargetDirectory( File targetDirectory );
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.java
Tue Dec 4 13:01:21 2007
@@ -1,6 +1,7 @@
package org.apache.maven.dotnet.compiler;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.dotnet.PlatformUnsupportedException;
public interface CompilerContext
{
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
Tue Dec 4 13:01:21 2007
@@ -1,5 +1,9 @@
package org.apache.maven.dotnet.compiler;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
+import org.apache.maven.dotnet.ArtifactType;
+
import java.io.File;
public interface DotnetCompilerConfig
@@ -52,7 +56,7 @@
private File localRepository;
- private File sourceDirectory;
+ private File compileSourceDirectory;
private File targetDirectory;
@@ -121,14 +125,14 @@
this.localRepository = localRepository;
}
- public File getSourceDirectory()
+ public File getCompilerDirectory()
{
- return sourceDirectory;
+ return compileSourceDirectory;
}
- public void setSourceDirectory( File sourceDirectory )
+ public void setCompilerSourceDirectory( File sourceDirectory )
{
- this.sourceDirectory = sourceDirectory;
+ this.compileSourceDirectory = sourceDirectory;
}
public File getTargetDirectory()
@@ -179,7 +183,7 @@
throw new IllegalArgumentException("localRepository");
}
- if ( sourceDirectory == null || !sourceDirectory.exists() )
+ if ( compileSourceDirectory == null ||
!compileSourceDirectory.exists() )
{
throw new IllegalArgumentException("sourceDirectory");
}
@@ -237,7 +241,7 @@
{
return false;
}
- if ( !sourceDirectory.equals( that.getSourceDirectory() ) )
+ if ( !compileSourceDirectory.equals(
that.getCompilerDirectory() ) )
{
return false;
}
@@ -261,7 +265,7 @@
result = 29 * result + artifactType.hashCode();
result = 29 * result + ( isTestCompile ? 1 : 0 );
result = 29 * result + localRepository.hashCode();
- result = 29 * result + sourceDirectory.hashCode();
+ result = 29 * result + compileSourceDirectory.hashCode();
result = 29 * result + targetDirectory.hashCode();
result = 29 * result + programmingLanguage.hashCode();
result = 29 * result + vendor.hashCode();
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java
Tue Dec 4 13:01:21 2007
@@ -18,4 +18,9 @@
{
return version;
}
+
+ public static DotnetCompilerPlatformVersion valueFromVersion(String
version)
+ {
+ return DotnetCompilerPlatformVersion.valueOf( "VERSION_" +
version.replace( '.', '_'));
+ }
}
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
Tue Dec 4 13:01:21 2007
@@ -15,8 +15,8 @@
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.dotnet.compiler.Vendor;
+import org.apache.maven.dotnet.PlatformUnsupportedException;
+import org.apache.maven.dotnet.Vendor;
import org.apache.maven.dotnet.compiler.CompilerAnnotation;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
@@ -256,31 +256,6 @@
}
}
}
-/*
- String className = compilerCapability.getPluginClassName();
-
- try
- {
- Class cc = Class.forName( className );
- compiler = (Compiler) cc.newInstance();
- compiler.init( this );//TODO: Add ArtifactInfo?
- }
- catch ( ClassNotFoundException e )
- {
- throw new PlatformUnsupportedException(
- "NMAVEN-061-004: Unable to create NetCompiler: Class Name = "
+ className, e );
- }
- catch ( InstantiationException e )
- {
- throw new PlatformUnsupportedException(
- "NMAVEN-061-005: Unable to create NetCompiler: Class Name = "
+ className, e );
- }
- catch ( IllegalAccessException e )
- {
- throw new PlatformUnsupportedException(
- "NMAVEN-061-006: Unable to create NetCompiler: Class Name = "
+ className, e );
- }
-*/
String basedir = project.getBuild().getDirectory() + File.separator +
"assembly-resources" + File.separator;
linkedResources = new File( basedir, "linkresource" ).exists() ? new
HashSet<File>(
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
Tue Dec 4 13:01:21 2007
@@ -1,6 +1,9 @@
package org.apache.maven.dotnet.compiler;
import org.junit.Test;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
+import org.apache.maven.dotnet.ArtifactType;
import java.io.File;
@@ -58,7 +61,7 @@
throws IllegalArgumentException
{
DotnetCompilerConfig config = getDefaultDotnetCompilerConfig();
- config.setSourceDirectory( null);
+ config.setCompilerSourceDirectory( null);
config.verifyCompilerConfig();
}
@@ -68,7 +71,7 @@
throws IllegalArgumentException
{
DotnetCompilerConfig config = getDefaultDotnetCompilerConfig();
- config.setSourceDirectory( new File("/" + Math.random()));
+ config.setCompilerSourceDirectory( new File("/" + Math.random()));
config.verifyCompilerConfig();
}
@@ -110,7 +113,7 @@
config.setCompilerPlatformVersion(
DotnetCompilerPlatformVersion.VERSION_2_0_50727 );
config.setLocalRepository( new File( "." ) );
config.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );
- config.setSourceDirectory( new File( "." ) );
+ config.setCompilerSourceDirectory( new File( "." ) );
config.setTargetDirectory( new File( "." ) );
config.setTestCompile( false );
config.setVendor( Vendor.MICROSOFT );
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
Tue Dec 4 13:01:21 2007
@@ -12,11 +12,11 @@
import org.apache.maven.model.Build;
import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
-import org.apache.maven.dotnet.compiler.PlatformUnsupportedException;
-import org.apache.maven.dotnet.compiler.ArtifactType;
+import org.apache.maven.dotnet.PlatformUnsupportedException;
+import org.apache.maven.dotnet.ArtifactType;
import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
-import org.apache.maven.dotnet.compiler.ProgrammingLanguage;
-import org.apache.maven.dotnet.compiler.Vendor;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
import org.apache.maven.dotnet.compiler.ClassCompiler;
import org.junit.Test;
@@ -44,8 +44,6 @@
{
DotnetCompilerContextImpl ctx = new DotnetCompilerContextImpl();
ctx.init( new MavenProject(), null );
-
-
}
@Test
@@ -223,7 +221,7 @@
"C:\\Program
Files\\Mono\\lib\\mono\\gac\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll" )
);
}
- @Test
+// @Test
public void testInit_ForCorrectCompiler()
throws PlatformUnsupportedException
{
@@ -249,7 +247,7 @@
config.setCompilerPlatformVersion(
DotnetCompilerPlatformVersion.VERSION_2_0_50727 );
config.setLocalRepository( new File( "." ) );
config.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );
- config.setSourceDirectory( new File( "." ) );
+ config.setCompilerSourceDirectory( new File( "." ) );
config.setTargetDirectory( new File( "." ) );
config.setTestCompile( false );
config.setVendor( Vendor.MICROSOFT );
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/pom.xml?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/pom.xml
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/pom.xml
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <version>0.14-incubating-SNAPSHOT</version>
+ <artifactId>dotnet-components</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-core</artifactId>
+ <name>dotnet-core</name>
+ <description>dotnet-core</description>
+</project>
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,125 @@
+package org.apache.maven.dotnet;
+
+/**
+ * Enumeration of all the valid target types (module, library, winexe, exe,
nar) for the .NET platform.
+ *
+ */
+public enum ArtifactType
+{
+ MODULE( "module", "module", "netmodule" ),
+ LIBRARY( "library", "library", "dll" ),
+ EXE( "exe", "exe", "exe" ),
+ WINEXE( "winexe", "winexe", "exe" ),
+ NAR( "nar", "null", "nar" ),
+ EXECONFIG( "exe.config", "null", "exe.config" ),
+ NETPLUGIN( "netplugin", "library", "dll" ),
+ VISUAL_STUDIO_ADDIN( "visual-studio-addin", "library", "dll" ),
+ SHARP_DEVELOP_ADDIN( "sharp-develop-addin", "library", "dll" ),
+ NULL( "null", "null", "null" );
+
+ /**
+ * The extension used for the artifact(netmodule, dll, exe)
+ */
+ private String extension;
+
+ /**
+ * The packaging type (as given in the package tag within the pom.xml) of
the artifact.
+ */
+ private String packagingType;
+
+ /**
+ * The target types (module, library, winexe, exe) for the .NET platform.
+ */
+ private String targetCompileType;
+
+ /**
+ * Constructor
+ */
+ ArtifactType( String packagingType, String targetCompileType, String
extension )
+ {
+ this.packagingType = packagingType;
+ this.targetCompileType = targetCompileType;
+ this.extension = extension;
+ }
+
+ /**
+ * Returns extension used for the artifact(netmodule, dll, exe).
+ *
+ * @return Extension used for the artifact(netmodule, dll, exe).
+ */
+ public String getExtension()
+ {
+ return extension;
+ }
+
+ /**
+ * Returns the packaging type (as given in the package tag within the
pom.xml) of the artifact.
+ *
+ * @return the packaging type (as given in the package tag within the
pom.xml) of the artifact.
+ */
+ public String getPackagingType()
+ {
+ return packagingType;
+ }
+
+ /**
+ * Returns target types (module, library, winexe, exe) for the .NET
platform.
+ *
+ * @return target types (module, library, winexe, exe) for the .NET
platform.
+ */
+ public String getTargetCompileType()
+ {
+ return targetCompileType;
+ }
+
+ /**
+ * Returns artifact type for the specified packaging name
+ *
+ * @param packagingName the package name (as given in the package tag
within the pom.xml) of the artifact.
+ * @return the artifact type for the specified packaging name
+ */
+ public static synchronized ArtifactType getArtifactTypeForPackagingName(
String packagingName )
+ {
+ if ( packagingName.equals( ArtifactType.MODULE.getPackagingType() ) )
+ {
+ return ArtifactType.MODULE;
+ }
+ else if ( packagingName.equals(
ArtifactType.LIBRARY.getPackagingType() ) )
+ {
+ return ArtifactType.LIBRARY;
+ }
+ else if ( packagingName.equals( ArtifactType.EXE.getPackagingType() ) )
+ {
+ return ArtifactType.EXE;
+ }
+ else if ( packagingName.equals( ArtifactType.WINEXE.getPackagingType()
) )
+ {
+ return ArtifactType.WINEXE;
+ }
+ else if ( packagingName.equals( ArtifactType.NAR.getPackagingType() ) )
+ {
+ return ArtifactType.LIBRARY;
+ }
+ else if ( packagingName.equals( ArtifactType.NAR.getPackagingType() ) )
+ {
+ return ArtifactType.NAR;
+ }
+ else if ( packagingName.equals(
ArtifactType.EXECONFIG.getPackagingType() ) )
+ {
+ return ArtifactType.EXECONFIG;
+ }
+ else if ( packagingName.equals(
ArtifactType.NETPLUGIN.getPackagingType() ) )
+ {
+ return ArtifactType.NETPLUGIN;
+ }
+ else if ( packagingName.equals(
ArtifactType.SHARP_DEVELOP_ADDIN.getPackagingType() ) )
+ {
+ return ArtifactType.SHARP_DEVELOP_ADDIN;
+ }
+ else if ( packagingName.equals(
ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) )
+ {
+ return ArtifactType.VISUAL_STUDIO_ADDIN;
+ }
+ return ArtifactType.NULL;
+ }
+}
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.dotnet;
+
+public enum BuildDirectories
+{
+ BUILD_SOURCES("build-sources"),
+ TEST_SOURCES("test-sources");
+
+ private String buildDirectoryName;
+
+ BuildDirectories(String buildDirectoryName)
+ {
+ this.buildDirectoryName = buildDirectoryName;
+ }
+
+ public String getBuildDirectoryName()
+ {
+ return buildDirectoryName;
+ }
+}
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,50 @@
+package org.apache.maven.dotnet;
+
+/**
+ * Exception thrown on initialization errors.
+ */
+public class InitializationException
+ extends Exception
+{
+
+ static final long serialVersionUID = -6193640178334L;
+
+ /**
+ * Constructs an <code>InitializationException</code> with no exception
message.
+ */
+ public InitializationException()
+ {
+ super();
+ }
+
+ /**
+ * Constructs an <code>InitializationException</code> with the specified
exception message.
+ *
+ * @param message the exception message
+ */
+ public InitializationException( String message )
+ {
+ super( message );
+ }
+
+ /**
+ * Constructs an <code>InitializationException</code> with the specified
exception message and cause of the exception.
+ *
+ * @param message the exception message
+ * @param cause the cause of the exception
+ */
+ public InitializationException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ /**
+ * Constructs an <code>InitializationException</code> with the cause of
the exception.
+ *
+ * @param cause the cause of the exception
+ */
+ public InitializationException( Throwable cause )
+ {
+ super( cause );
+ }
+}
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,52 @@
+package org.apache.maven.dotnet;
+
+/**
+ * Exception class thrown when the invoking platform does not support the
given vendor (MICROSOFT/MONO) or the compiler
+ * language.
+ */
+public class PlatformUnsupportedException
+ extends Exception
+{
+
+ static final long serialVersionUID = 342635474673243L;
+
+ /**
+ * Constructs an <code>PlatformUnsupportedException</code> with no
exception message.
+ */
+ public PlatformUnsupportedException()
+ {
+ super();
+ }
+
+ /**
+ * Constructs an <code>PlatformUnsupportedException</code> with the
specified exception message.
+ *
+ * @param message the exception message
+ */
+ public PlatformUnsupportedException( String message )
+ {
+ super( message );
+ }
+
+ /**
+ * Constructs an <code>PlatformUnsupportedException</code> with the
specified exception message and cause of the exception.
+ *
+ * @param message the exception message
+ * @param cause the cause of the exception
+ */
+ public PlatformUnsupportedException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ /**
+ * Constructs an <code>PlatformUnsupportedException</code> with the cause
of the exception.
+ *
+ * @param cause the cause of the exception
+ */
+ public PlatformUnsupportedException( Throwable cause )
+ {
+ super( cause );
+ }
+
+}
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,20 @@
+package org.apache.maven.dotnet;
+
+public enum ProgrammingLanguage
+{
+ JAVA("java"),
+ C_SHARP("cs"),
+ VISUAL_BASIC("vb");
+
+ private String classFileExtension;
+
+ private ProgrammingLanguage(String classFileExtension)
+ {
+ this.classFileExtension = classFileExtension;
+ }
+
+ public String getClassFileExtension()
+ {
+ return classFileExtension;
+ }
+}
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java?rev=601084&view=auto
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
(added)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
Tue Dec 4 13:01:21 2007
@@ -0,0 +1,8 @@
+package org.apache.maven.dotnet;
+
+public enum Vendor
+{
+ MICROSOFT,
+ NOVELL,
+ ANY
+}
Propchange:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/pom.xml?rev=601084&r1=601083&r2=601084&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/pom.xml
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/pom.xml
Tue Dec 4 13:01:21 2007
@@ -18,20 +18,19 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-incubating-SNAPSHOT</version>
- <artifactId>dotnet-project</artifactId>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>dotnet-components</artifactId>
- <packaging>pom</packaging>
- <name>dotnet-components</name>
- <url>http://incubator.apache.org/nmaven</url>
- <description>NMaven provides Maven 2.x plugins to support building of .NET
applications</description>
- <modules>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-components</artifactId>
+ <version>0.14-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>dotnet-components</name>
+ <url>http://incubator.apache.org/nmaven</url>
+ <description>NMaven provides Maven 2.x plugins to support building of .NET
applications</description>
+ <modules>
+ <module>dotnet-assembler</module>
+ <module>dotnet-core</module>
<module>dotnet-compiler</module>
<module>dotnet-compiler-ext</module>
</modules>
@@ -43,12 +42,47 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <mavenVersion>2.0.8</mavenVersion>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
