Author: sisbell
Date: Tue Dec 4 21:17:23 2007
New Revision: 601210
URL: http://svn.apache.org/viewvc?rev=601210&view=rev
Log:
Cleanup of api, added annotations to marshallers.
Modified:
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-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/DefaultAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/JavaAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/VBAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
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=601210&r1=601209&r2=601210&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 21:17:23 2007
@@ -34,11 +34,10 @@
* Writes the assembly info to AssemblyInfo.[language-extension].
*
* @param assemblyInfo the assembly info
- * @param buildDirectory the build directory
* @param outputStream the output stream to write to (currently unused)
* @throws IOException if there was a problem writing out the class file
*/
- void marshal( AssemblyInfo assemblyInfo, File buildDirectory, OutputStream
outputStream )
+ void marshal( AssemblyInfo assemblyInfo, OutputStream outputStream )
throws 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=601210&r1=601209&r2=601210&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 21:17:23 2007
@@ -8,5 +8,5 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AssemblyInfoMarshallerAnnotation
{
- ProgrammingLanguage[] programmingLanguaqes();
+ ProgrammingLanguage[] programmingLanguages();
}
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/DefaultAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/DefaultAssemblyInfoMarshaller.java?rev=601210&r1=601209&r2=601210&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/DefaultAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/DefaultAssemblyInfoMarshaller.java
Tue Dec 4 21:17:23 2007
@@ -20,6 +20,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
+import org.apache.maven.dotnet.assembler.AssemblyInfoMarshallerAnnotation;
import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
@@ -33,6 +34,7 @@
/**
* Provides services for writing out the AssemblyInfo entries using the
bracket convention [assembly:
*/
[EMAIL PROTECTED](programmingLanguages = {ProgrammingLanguage.C_SHARP})
public final class DefaultAssemblyInfoMarshaller
implements AssemblyInfoMarshaller
{
@@ -40,7 +42,7 @@
private File buildSourcesDirectory;
- public void marshal( AssemblyInfo assemblyInfo, File buildDirectory,
OutputStream outputStream )
+ public void marshal( AssemblyInfo assemblyInfo, OutputStream outputStream )
throws IOException
{
StringBuffer sb = new StringBuffer();
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/JavaAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/JavaAssemblyInfoMarshaller.java?rev=601210&r1=601209&r2=601210&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/JavaAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/JavaAssemblyInfoMarshaller.java
Tue Dec 4 21:17:23 2007
@@ -20,6 +20,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
+import org.apache.maven.dotnet.assembler.AssemblyInfoMarshallerAnnotation;
import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
@@ -30,9 +31,8 @@
/**
* Provides services for writing out the AssemblyInfo entries for Java, where
each entry begins with '/**@' and ends with '*\/'
- *
- * @author Shane Isbell
*/
[EMAIL PROTECTED](programmingLanguages = {ProgrammingLanguage.JAVA})
public final class JavaAssemblyInfoMarshaller
implements AssemblyInfoMarshaller
{
@@ -40,7 +40,7 @@
private File buildSourcesDirectory;
- public void marshal( AssemblyInfo assemblyInfo, File buildDirectory,
OutputStream outputStream )
+ public void marshal( AssemblyInfo assemblyInfo, OutputStream outputStream )
throws IOException
{
StringBuffer sb = new StringBuffer();
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/VBAssemblyInfoMarshaller.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/VBAssemblyInfoMarshaller.java?rev=601210&r1=601209&r2=601210&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/VBAssemblyInfoMarshaller.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/assembler/VBAssemblyInfoMarshaller.java
Tue Dec 4 21:17:23 2007
@@ -20,6 +20,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
+import org.apache.maven.dotnet.assembler.AssemblyInfoMarshallerAnnotation;
import org.apache.maven.dotnet.ProgrammingLanguage;
import java.io.OutputStream;
@@ -30,10 +31,8 @@
/**
* Provides services for writing out the AssemblyInfo entries for VB using the
angle bracket convention <assembly:
- *
- * @author Shane Isbell
*/
-
[EMAIL PROTECTED](programmingLanguages = {ProgrammingLanguage.VISUAL_BASIC})
public final class VBAssemblyInfoMarshaller
implements AssemblyInfoMarshaller
{
@@ -41,7 +40,7 @@
private File buildSourcesDirectory;
- public void marshal( AssemblyInfo assemblyInfo, File buildDirectory,
OutputStream outputStream )
+ public void marshal( AssemblyInfo assemblyInfo, OutputStream outputStream )
throws IOException
{
StringBuffer sb = new StringBuffer();
Modified:
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java?rev=601210&r1=601209&r2=601210&view=diff
==============================================================================
---
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
(original)
+++
incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-extensions-maven/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
Tue Dec 4 21:17:23 2007
@@ -20,7 +20,7 @@
@CompilerAnnotation(programmingLanguaqe = ProgrammingLanguage.C_SHARP,
vendors = {Vendor.MICROSOFT, Vendor.NOVELL, Vendor.ANY},
dotnetCompilerPlatformVersions =
{DotnetCompilerPlatformVersion.VERSION_2_0_50727,
DotnetCompilerPlatformVersion.VERSION_3_0})
-public class CSharpClassCompiler
+public final class CSharpClassCompiler
implements org.apache.maven.dotnet.compiler.ClassCompiler
{
private DotnetCompilerContext compilerContext;
