incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r603486 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: components/dotnet-assembler/ components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/ components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assemb...
Date Wed, 12 Dec 2007 06:50:25 GMT
Author: sisbell
Date: Tue Dec 11 22:50:15 2007
New Revision: 603486

URL: http://svn.apache.org/viewvc?rev=603486&view=rev
Log:
Additional moving and adding of files.

Added:
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/
      - copied from r603478, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
  (with props)
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
  (with props)
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
  (with props)
Removed:
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/resources/
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/test/
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PathUtil.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/RepositoryNotFoundException.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/impl/
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/resources/
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/test/
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-compiler/
Modified:
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoException.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml Tue
Dec 11 22:50:15 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/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/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
Tue Dec 11 22:50:15 2007
@@ -18,9 +18,8 @@
  */
 package org.apache.maven.dotnet.assembler;
 
-import org.apache.maven.dotnet.InitializationException;
-import org.apache.maven.dotnet.PlatformUnsupportedException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.dotnet.ProgrammingLanguage;
 
 /**
  * Provides services for generating of AssemblyInfo.* file.
@@ -45,29 +44,19 @@
     /**
      * Returns the marshaller for the given language
      *
-     * @param language the .NET language
+     * @param programmingLanguage the .NET language
      * @return the marshaller for the specified language
      * @throws AssemblyInfoException if no marshaller can be found for the specified language
      */
-    AssemblyInfoMarshaller getAssemblyInfoMarshallerFor( String language )
+    AssemblyInfoMarshaller getAssemblyInfoMarshallerFor( ProgrammingLanguage programmingLanguage
)
         throws AssemblyInfoException;
 
     /**
-     * Returns the class extension (cs, vb) for the specified language.
-     *
-     * @param language the class language. Must match language within the assembly-plugins.xml
file.
-     * @return the class extension (cs, vb) for the specified language.
-     * @throws PlatformUnsupportedException the language is not supported
-     */
-    String getClassExtensionFor(String language) throws PlatformUnsupportedException;
-
-    /**
      * Initializes the context
      *
      * @param mavenProject the maven project
-     * @throws InitializationException if the context cannot be initialized
      */
     void init( MavenProject mavenProject )
-        throws InitializationException;
+        throws AssemblyInfoException;
 
 }

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
Tue Dec 11 22:50:15 2007
@@ -23,8 +23,6 @@
 /**
  * Provides the information to be included within the assembly. Class can be extended to
add additional assembly info
  * parameters.
- *
- * @author Shane Isbell
  */
 public class AssemblyInfo
 {
@@ -149,7 +147,6 @@
     {
         this.informationalVersion = informationalVersion;
     }
-
 
     public String getDescription()
     {

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoException.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoException.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoException.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoException.java
Tue Dec 11 22:50:15 2007
@@ -20,8 +20,6 @@
 
 /**
  * Exception thrown when there is a problem processing the assembly info.
- *
- * @author Shane Isbell
  */
 public class AssemblyInfoException
     extends Exception

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/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/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
Tue Dec 11 22:50:15 2007
@@ -18,17 +18,15 @@
  */
 package org.apache.maven.dotnet.assembler;
 
+import org.apache.maven.dotnet.ProgrammingLanguage;
+
 import java.io.OutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.dotnet.model.assembly.plugins.AssemblyPlugin;
+import java.io.File;
 
 /**
  * Provides services for creating an AssemblyInfo class.
- *
- * @author Shane Isbell
  */
 public interface AssemblyInfoMarshaller
 {
@@ -36,11 +34,10 @@
      * Writes the assembly info to AssemblyInfo.[language-extension].
      *
      * @param assemblyInfo the assembly info
-     * @param mavenProject the maven project
      * @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, MavenProject mavenProject, OutputStream outputStream
)
+    void marshal( AssemblyInfo assemblyInfo, OutputStream outputStream )
         throws IOException;
 
     /**
@@ -50,14 +47,9 @@
      * @return an AssemblyInfo object for the specified input stream
      * @throws IOException if there was a problem reading the AssemblyInfo class file
      */
-    AssemblyInfo unmarshall( InputStream inputStream) throws IOException;    
+    AssemblyInfo unmarshall( InputStream inputStream) throws IOException;
 
-    /**
-     * Initializes the marshaller.
-     *
-     * @param plugin the assembly plugin model associated with this marshaller (plugin specified
within the
-     *               assembly-plugins.xml file)
-     */
-    void init( AssemblyPlugin plugin );
+    void init( ProgrammingLanguage programmingLanguage, File buildSourcesDirectory );
 
+    ProgrammingLanguage getProgrammingLanguageForMarshaller();
 }

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/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/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
Tue Dec 11 22:50:15 2007
@@ -22,18 +22,21 @@
 import org.apache.maven.dotnet.assembler.AssemblyInfo;
 import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
 import org.apache.maven.dotnet.assembler.AssemblyInfoException;
-import org.apache.maven.dotnet.InitializationException;
-import org.apache.maven.dotnet.PlatformUnsupportedException;
-import org.apache.maven.dotnet.model.assembly.plugins.AssemblyPlugin;
+import org.apache.maven.dotnet.assembler.AssemblyInfoMarshallerAnnotation;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.BuildDirectories;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.model.Organization;
 
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
-import org.apache.maven.dotnet.registry.RepositoryRegistry;
 
 import java.io.*;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarFile;
+import java.util.jar.JarEntry;
 
 /**
  * Provides an implementation of the <code>AssemblerContext</code>.
@@ -44,13 +47,6 @@
     implements AssemblerContext, LogEnabled
 {
 
-    private static final String SNAPSHOT_SUFFIX = "SNAPSHOT";
-
-    /**
-     * A registry component of repository (config) files
-     */
-    private RepositoryRegistry repositoryRegistry;
-
     /**
      * The maven project
      */
@@ -61,11 +57,7 @@
      */
     private Logger logger;
 
-    /**
-     * The assembly plugins repository used for accessing assembly plugin information, which
in turn is used for
-     * generating an <code>AssemblyInfo</code> object.
-     */
-    private AssemblyPluginsRepository repository;
+    private List<AssemblyInfoMarshaller> marshallers;
 
     /**
      * Constructor. This method is intended to by invoked by the plexus-container, not by
the application developer.
@@ -87,17 +79,17 @@
      */
     public AssemblyInfo getAssemblyInfo()
     {
-        String basedir = mavenProject.getBasedir().toString();
         AssemblyInfo assemblyInfo = new AssemblyInfo();
         String description = mavenProject.getDescription();
         String version = mavenProject.getVersion();
         String name = mavenProject.getName();
-        Organization org = mavenProject.getOrganization();
-        String company = ( org != null ) ? org.getName() : "";
+        Organization organization = mavenProject.getOrganization();
+        String company = ( organization != null ) ? organization.getName() : "";
         String copyright = null;
         String informationalVersion = "";
         String configuration = "";
 
+        String basedir = mavenProject.getBasedir().toString();
         File file = new File( basedir + "/COPYRIGHT.txt" );
         if ( file.exists() )
         {
@@ -140,67 +132,93 @@
     }
 
     /**
-     * @see AssemblerContext#getAssemblyInfoMarshallerFor(String)
+     * @see AssemblerContext#getAssemblyInfoMarshallerFor(ProgrammingLanguage)
      */
-    public AssemblyInfoMarshaller getAssemblyInfoMarshallerFor( String language )
+    public AssemblyInfoMarshaller getAssemblyInfoMarshallerFor( ProgrammingLanguage programmingLanguage
)
         throws AssemblyInfoException
     {
-        AssemblyPlugin plugin = repository.getAssemblyPluginFor( language );
-        String className = plugin.getPluginClass();
-        AssemblyInfoMarshaller marshaller;
-        try
-        {
-            Class cc = Class.forName( className );
-            marshaller = (AssemblyInfoMarshaller) cc.newInstance();
-            marshaller.init( plugin );
-        }
-        catch ( ClassNotFoundException e )
-        {
-            throw new AssemblyInfoException(
-                "NMAVEN-020-002: Unable to create AssemblyInfoMarshaller: Class Name = "
+ className, e );
-        }
-        catch ( InstantiationException e )
-        {
-            throw new AssemblyInfoException(
-                "NMAVEN-020-003: Unable to create AssemblyInfoMarshaller: Class Name = "
+ className, e );
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new AssemblyInfoException(
-                "NMAVEN-020-004: Unable to create AssemblyInfoMarshaller: Class Name = "
+ className, e );
-        }
-
-        return marshaller;
-    }
 
-    /**
-     * @see AssemblerContext#getClassExtensionFor(String)
-     */
-    public String getClassExtensionFor( String language )
-        throws PlatformUnsupportedException
-    {
-        try
-        {
-            return repository.getAssemblyPluginFor( language ).getExtension();
-        }
-        catch ( AssemblyInfoException e )
+        for(AssemblyInfoMarshaller m : marshallers)
         {
-            throw new PlatformUnsupportedException( "NMAVEN-020-006: Language not supported:
Language = " + language,
-                                                    e );
+            if(m.getProgrammingLanguageForMarshaller().equals( programmingLanguage))
+            {
+                return m;
+            }
         }
+        return null;
     }
 
     /**
      * @see AssemblerContext#init(org.apache.maven.project.MavenProject)
      */
     public void init( MavenProject mavenProject )
-        throws InitializationException
+        throws AssemblyInfoException
     {
         this.mavenProject = mavenProject;
-        repository = (AssemblyPluginsRepository) repositoryRegistry.find( "assembly-plugins"
);
-        if ( repository == null )
+
+        String[] classPathJars = System.getProperty( "java.class.path" ).split( "[" + File.pathSeparator
+ "]" );
+        for ( String classPathJar : classPathJars )
         {
-            throw new InitializationException( "NMAVEN-020-005: Unable to find the assembly-plugins.xml
file" );
+            if ( classPathJar.contains( "dotnet-extensions-" ) )
+            {
+                JarFile jarFile = null;
+                try
+                {
+                    jarFile = new JarFile( classPathJar );
+                }
+                catch ( IOException e )
+                {
+                    e.printStackTrace();
+                }
+                Enumeration jarEntries = jarFile.entries();
+
+                while ( jarEntries.hasMoreElements() )
+                {
+                    JarEntry jarEntry = (JarEntry) jarEntries.nextElement();
+                    if ( jarEntry.isDirectory() || !jarEntry.getName().endsWith( "class"
) )
+                    {
+                        continue;
+                    }
+
+                    String className = null;
+                    try
+                    {
+                        String[] tokens = jarEntry.getName().split( "[//]" );
+
+                        Class c = Class.forName( tokens[tokens.length - 1].split( "[.]" )[0]
);
+                        className = c.getName();
+                        AssemblyInfoMarshallerAnnotation annotation =
+                            (AssemblyInfoMarshallerAnnotation) c.getAnnotation(
+                                AssemblyInfoMarshallerAnnotation.class );
+                        if ( annotation != null )
+                        {
+                            for ( ProgrammingLanguage programmingLanguage : annotation.programmingLanguages()
)
+                            {
+                                AssemblyInfoMarshaller marshaller = (AssemblyInfoMarshaller)
c.newInstance();
+                                marshaller.init( programmingLanguage, new File( mavenProject.getBuild().getDirectory(),
+                                                                                BuildDirectories.BUILD_SOURCES.getBuildDirectoryName()
) );
+                                marshallers.add( marshaller );
+                            }
+
+                        }
+                    }
+                    catch ( ClassNotFoundException e )
+                    {
+                        throw new AssemblyInfoException(
+                            "NMAVEN-061-007: Unable to create AssemblyInfoMarshaller: Class
Name = " + className, e );
+                    }
+                    catch ( InstantiationException e )
+                    {
+                        throw new AssemblyInfoException(
+                            "NMAVEN-020-003: Unable to create AssemblyInfoMarshaller: Class
Name = " + className, e );
+                    }
+                    catch ( IllegalAccessException e )
+                    {
+                        throw new AssemblyInfoException(
+                            "NMAVEN-020-004: Unable to create AssemblyInfoMarshaller: Class
Name = " + className, e );
+                    }
+                }
+            }
         }
     }
 }

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/pom.xml?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/pom.xml Tue Dec
11 22:50:15 2007
@@ -18,38 +18,16 @@
 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>NMaven</description>  
-  <dependencies> 
-    <dependency> 
-      <groupId>org.apache.maven.dotnet</groupId>  
-      <artifactId>dotnet-registry</artifactId>  
-      <version>0.14-incubating-SNAPSHOT</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.apache.maven</groupId>  
-      <artifactId>maven-plugin-api</artifactId> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.apache.maven</groupId>  
-      <artifactId>maven-project</artifactId> 
-    </dependency> 
-  </dependencies>  
-  <build> 
-    <resources> 
-      <resource> 
-        <directory>src/main/resources</directory>  
-        <filtering>true</filtering> 
-      </resource> 
-    </resources> 
-  </build> 
+<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>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ArtifactType.java
Tue Dec 11 22:50:15 2007
@@ -1,27 +1,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.
- */
 package org.apache.maven.dotnet;
 
 /**
  * Enumeration of all the valid target types (module, library, winexe, exe, nar) for the
.NET platform.
  *
- * @author Shane Isbell
  */
 public enum ArtifactType
 {

Added: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java?rev=603486&view=auto
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
(added)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
Tue Dec 11 22:50:15 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/components/dotnet-core/src/main/java/org/apache/maven/dotnet/BuildDirectories.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/InitializationException.java
Tue Dec 11 22:50:15 2007
@@ -1,27 +1,7 @@
-/*
- * 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.
- */
 package org.apache.maven.dotnet;
 
 /**
  * Exception thrown on initialization errors.
- *
- * @author Shane Isbell
  */
 public class InitializationException
     extends Exception

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java?rev=603486&r1=603485&r2=603486&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/PlatformUnsupportedException.java
Tue Dec 11 22:50:15 2007
@@ -1,28 +1,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.
- */
 package org.apache.maven.dotnet;
 
 /**
  * Exception class thrown when the invoking platform does not support the given vendor (MICROSOFT/MONO)
or the compiler
  * language.
- *
- * @author Shane Isbell
  */
 public class PlatformUnsupportedException
     extends Exception

Added: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java?rev=603486&view=auto
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
(added)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
Tue Dec 11 22:50:15 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/components/dotnet-core/src/main/java/org/apache/maven/dotnet/ProgrammingLanguage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java?rev=603486&view=auto
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
(added)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
Tue Dec 11 22:50:15 2007
@@ -0,0 +1,8 @@
+package org.apache.maven.dotnet;
+
+public enum Vendor
+{
+    MICROSOFT,
+    NOVELL,
+    ANY
+}

Propchange: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Vendor.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message