incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r531653 [1/2] - in /incubator/nmaven/branches/SI_XPT/components: ./ dotnet-artifact/ dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ dotnet-assembler/ dotn...
Date Mon, 23 Apr 2007 23:28:21 GMT
Author: sisbell
Date: Mon Apr 23 16:28:17 2007
New Revision: 531653

URL: http://svn.apache.org/viewvc?view=rev&rev=531653
Log:
Improved documentation.

Modified:
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependencyMatchPolicy.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenProject.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenExecutionRequestImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenProjectImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/MavenFormatter.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLogger.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLoggerManager.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/test/java/ServiceTest.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutable.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DotGNUCompiler.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/NemerleCompiler.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/PhpCompiler.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/assembly-plugins/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/compiler-plugins/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/entries/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/executable-plugins/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/netdependency/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-model/settings/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-registry/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/package.html
    incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/package.html
    incubator/nmaven/branches/SI_XPT/components/pom.xml

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+<?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="http://maven.apache.org/POM/4.0.0" 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>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java Mon Apr 23 16:28:17 2007
@@ -80,6 +80,12 @@
      */
     List<Artifact> getArtifactsFor( String groupId, String artifactId, String version, String type );
 
+    /**
+     * Returns the artifact for the specified ID
+     *
+     * @param id the artifact ID, as given in the net-dependencies.xml file
+     * @return the artifact for the specified ID.
+     */
     Artifact getArtifactByID( String id );
     
     /**
@@ -100,6 +106,11 @@
      */
     ApplicationConfig getApplicationConfigFor( Artifact artifact );
 
+    /**
+     * Returns the directory containing the local Maven repository
+     *
+     * @return the directory containing the local Maven repository
+     */
     File getLocalRepository();
 
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java Mon Apr 23 16:28:17 2007
@@ -25,24 +25,37 @@
  */
 public enum ArtifactType
 {
-    MODULE( "module", "netmodule" ),
-    LIBRARY( "library", "dll" ),
-    EXE( "exe", "exe" ),
-    WINEXE( "winexe", "exe" ),
-    NAR( "nar", "nar" ),
-    EXECONFIG( "exe.config", "exe.config" ),
-    NULL( "null", "null" );
+    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" ),
+    NULL( "null", "null", "null" );
 
+    /**
+     * The extension used for the artifact(netmodule, dll, exe)
+     */
     private String extension;
 
-    private String artifactTypeName;
+    /**
+     * 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 artifactTypeName, String extension )
+    ArtifactType( String packagingType, String targetCompileType, String extension )
     {
-        this.artifactTypeName = artifactTypeName;
+        this.packagingType = packagingType;
+        this.targetCompileType = targetCompileType;
         this.extension = extension;
     }
 
@@ -57,73 +70,64 @@
     }
 
     /**
+     * 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 getArtifactTypeName()
+    public String getTargetCompileType()
     {
-        return artifactTypeName;
+        return targetCompileType;
     }
 
-    public static synchronized ArtifactType getArtifactTypeForName(String name)
+    /**
+     * 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 ( name.equals( ArtifactType.MODULE.getArtifactTypeName() ) )
+        if ( packagingName.equals( ArtifactType.MODULE.getPackagingType() ) )
         {
             return ArtifactType.MODULE;
         }
-        else if ( name.equals( ArtifactType.LIBRARY.getArtifactTypeName() ) )
+        else if ( packagingName.equals( ArtifactType.LIBRARY.getPackagingType() ) )
         {
             return ArtifactType.LIBRARY;
         }
-        else if ( name.equals( ArtifactType.EXE.getArtifactTypeName() ) )
+        else if ( packagingName.equals( ArtifactType.EXE.getPackagingType() ) )
         {
             return ArtifactType.EXE;
         }
-        else if ( name.equals( ArtifactType.WINEXE.getArtifactTypeName() ) )
+        else if ( packagingName.equals( ArtifactType.WINEXE.getPackagingType() ) )
         {
             return ArtifactType.WINEXE;
         }
-        else if ( name.equals( ArtifactType.NAR.getArtifactTypeName() ) )
+        else if ( packagingName.equals( ArtifactType.NAR.getPackagingType() ) )
         {
            return ArtifactType.LIBRARY;
         }
-        else if ( name.equals( ArtifactType.NAR.getArtifactTypeName() ) )
+        else if ( packagingName.equals( ArtifactType.NAR.getPackagingType() ) )
         {
            return ArtifactType.NAR;
         }
-        else if ( name.equals( ArtifactType.EXECONFIG.getArtifactTypeName() ) )
+        else if ( packagingName.equals( ArtifactType.EXECONFIG.getPackagingType() ) )
         {
            return ArtifactType.EXECONFIG;
         }
-        return ArtifactType.NULL;
-    }
-
-    public static synchronized ArtifactType getArtifactTypeForExtension(String extension)
-    {
-        if ( extension.equals( ArtifactType.MODULE.getExtension()) )
+        else if ( packagingName.equals( ArtifactType.NETPLUGIN.getPackagingType() ) )
         {
-            return ArtifactType.MODULE;
-        }
-        else if ( extension.equals( ArtifactType.LIBRARY.getExtension() ) )
-        {
-            return ArtifactType.LIBRARY;
-        }
-        else if ( extension.equals( ArtifactType.EXE.getExtension() ) )
-        {
-            return ArtifactType.EXE;
-        }
-        else if ( extension.equals( ArtifactType.WINEXE.getExtension() ) )
-        {
-            return ArtifactType.WINEXE;
-        }
-        else if ( extension.equals( ArtifactType.NAR.getExtension() ) )
-        {
-           return ArtifactType.LIBRARY;
-        }
-        else if ( extension.equals( ArtifactType.EXECONFIG.getExtension() ) )
-        {
-           return ArtifactType.EXECONFIG;
+           return ArtifactType.NETPLUGIN;
         }
         return ArtifactType.NULL;
     }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java Mon Apr 23 16:28:17 2007
@@ -57,7 +57,6 @@
      * @throws ArtifactResolutionException
      * @throws ArtifactNotFoundException
      */
-
     void resolveTransitivelyFor( MavenProject project, Artifact sourceArtifact, List<Dependency> dependencies,
                                  File pomFile, String localRepositoryPath, boolean addResolvedDependenciesToProject )
         throws ArtifactResolutionException, ArtifactNotFoundException;

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependencyMatchPolicy.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependencyMatchPolicy.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependencyMatchPolicy.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/NetDependencyMatchPolicy.java Mon Apr 23 16:28:17 2007
@@ -20,6 +20,11 @@
 
 import org.apache.maven.dotnet.model.netdependency.NetDependency;
 
+/**
+ * Provides a way for a developer to implement custom match policies for a net dependency.
+ *
+ * @author Shane Isbell
+ */
 public interface NetDependencyMatchPolicy
 {
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java Mon Apr 23 16:28:17 2007
@@ -106,6 +106,9 @@
         this.logger = logger;
     }
 
+    /**
+     * @see org.apache.maven.dotnet.artifact.ArtifactContext#getLocalRepository()
+     */
     public File getLocalRepository()
     {
         return new File(localRepository);
@@ -129,6 +132,9 @@
         return repository.getArtifactsFor( groupId, artifactId, version, type );
     }
 
+    /**
+     * @see ArtifactContext#getArtifactByID(String)
+     */
     public Artifact getArtifactByID( String id )
     {
         NetDependenciesRepositoryImpl repository =

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Mon Apr 23 16:28:17 2007
@@ -283,7 +283,7 @@
 
         for ( Dependency dependency : dependencies )
         {
-            if(!dependency.getType().equals( "library"))
+            if(! (dependency.getType().equals( "library") || dependency.getType().equals( "netplugin")))
             {
                 continue;
             }
@@ -296,7 +296,7 @@
 
             depPath.append( dependency.getArtifactId() ).append( File.separator )
                 .append( dependency.getVersion() ).append( File.separator );
-            String extension = ArtifactType.getArtifactTypeForName( dependency.getType() ).getExtension();
+            String extension = ArtifactType.getArtifactTypeForPackagingName( dependency.getType() ).getExtension();
             File file =
                 new File( depPath.toString() + dependency.getArtifactId() + "." + extension );
 

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java Mon Apr 23 16:28:17 2007
@@ -187,6 +187,12 @@
         return artifacts;
     }
 
+    /**
+     * Returns the artifact associated with the specified id. 
+     *
+     * @param id the artifact ID
+     * @return the artifact associated with the specified id
+     */
     Artifact getArtifactByID( String id )
     {
         for ( NetDependency netDependency : netDependencies )

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/package.html Mon Apr 23 16:28:17 2007
@@ -4,20 +4,23 @@
 <!--
 
   @(#)package.html
+  
+   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
 
-   Copyright 2006 Shane Isbell
+     http://www.apache.org/licenses/LICENSE-2.0
 
-   Licensed 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.
+   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.
 
 -->
 </head>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/package.html
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/package.html?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/package.html (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/package.html Mon Apr 23 16:28:17 2007
@@ -4,20 +4,23 @@
 <!--
 
   @(#)package.html
+  
+   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
 
-   Copyright 2006 Shane Isbell
+     http://www.apache.org/licenses/LICENSE-2.0
 
-   Licensed 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.
+   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.
 
 -->
 </head>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/pom.xml?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/pom.xml Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+<?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="http://maven.apache.org/POM/4.0.0" 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>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java Mon Apr 23 16:28:17 2007
@@ -99,6 +99,11 @@
         return sb.toString();
     }
 
+    /**
+     * Returns the key name.
+     *
+     * @return the key name
+     */
     public String getKeyName()
     {
         return keyName;

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfoMarshaller.java Mon Apr 23 16:28:17 2007
@@ -32,7 +32,6 @@
  */
 public interface AssemblyInfoMarshaller
 {
-
     /**
      * Writes the assembly info to AssemblyInfo.[language-extension].
      *

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java Mon Apr 23 16:28:17 2007
@@ -31,7 +31,6 @@
 import java.io.InputStreamReader;
 
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.FileUtils;
 
 /**
  * Provides services for writing out the AssemblyInfo entries using the bracket convention [assembly:
@@ -67,23 +66,28 @@
             .append( createEntry( "Culture", assemblyInfo.getCulture() ) )
             .append( createEntry( "Version", assemblyInfo.getVersion() ) )
             .append( createEntry( "Configuration", assemblyInfo.getConfiguration() ) );
-            if(assemblyInfo.getKeyName() != null) sb.append( createEntry( "KeyName", assemblyInfo.getKeyName() ) );
-            if(assemblyInfo.getKeyFile() != null)
-                sb.append(createEntry("KeyFile", assemblyInfo.getKeyFile().getAbsolutePath().replace( "\\", "\\\\")));
+        if ( assemblyInfo.getKeyName() != null )
+        {
+            sb.append( createEntry( "KeyName", assemblyInfo.getKeyName() ) );
+        }
+        if ( assemblyInfo.getKeyFile() != null )
+        {
+            sb.append( createEntry( "KeyFile", assemblyInfo.getKeyFile().getAbsolutePath().replace( "\\", "\\\\" ) ) );
+        }
         FileOutputStream man = null;
         try
         {
-            String groupIdAsDir = mavenProject.getGroupId().replace( ".", File.separator);
+            String groupIdAsDir = mavenProject.getGroupId().replace( ".", File.separator );
             File file = new File( src + "/META-INF/" + groupIdAsDir );
             file.mkdirs();
-            man = new FileOutputStream( src + "/META-INF/" + groupIdAsDir + File.separator +
-                "AssemblyInfo." + plugin.getExtension() );
+            man = new FileOutputStream(
+                src + "/META-INF/" + groupIdAsDir + File.separator + "AssemblyInfo." + plugin.getExtension() );
             man.write( sb.toString().getBytes() );
         }
         catch ( IOException e )
         {
             e.printStackTrace();
-            throw new IOException( "Failed to generate AssemblyInfo" );
+            throw new IOException( "NMAVEN-022-000: Failed to generate AssemblyInfo" );
         }
         finally
         {
@@ -102,48 +106,89 @@
         this.plugin = plugin;
     }
 
-    public AssemblyInfo unmarshall( InputStream inputStream) throws IOException {
+    /**
+     * @see AssemblyInfoMarshaller#unmarshall(java.io.InputStream)
+     */
+    public AssemblyInfo unmarshall( InputStream inputStream )
+        throws IOException
+    {
         AssemblyInfo assemblyInfo = new AssemblyInfo();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+        BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
         String line;
-        while ((line = reader.readLine()) != null) {
-            String[] tokens = line.split("[:]");
+        while ( ( line = reader.readLine() ) != null )
+        {
+            String[] tokens = line.split( "[:]" );
 
-            if (tokens.length == 2) {
-                String[] assemblyTokens = tokens[1].split("[(]");
+            if ( tokens.length == 2 )
+            {
+                String[] assemblyTokens = tokens[1].split( "[(]" );
                 String name = assemblyTokens[0].trim();
-                String value = assemblyTokens[1].trim().split("[\"]")[1].trim();
-                setAssemblyInfo(assemblyInfo, name, value);
+                String value = assemblyTokens[1].trim().split( "[\"]" )[1].trim();
+                setAssemblyInfo( assemblyInfo, name, value );
             }
         }
         return assemblyInfo;
     }
 
-    private void setAssemblyInfo(AssemblyInfo assemblyInfo, String name, String value) throws IOException {
-        if (!name.startsWith("Assembly"))
-            throw new IOException("NMAVEN-xxx-xxx: Invalid assembly info parameter: Name = " + name + ", Value = " + value);
-        if(name.equals("AssemblyDescription")) {
-            assemblyInfo.setDescription(value);
-        } else if(name.equals("AssemblyTitle")) {
-            assemblyInfo.setTitle(value);
-        } else if(name.equals("AssemblyCompany")) {
-            assemblyInfo.setCompany(value);
-        } else if(name.equals("AssemblyProduct")) {
-            assemblyInfo.setProduct(value);
-        } else if(name.equals("AssemblyCopyright")) {
-            assemblyInfo.setCopyright(value);
-        } else if(name.equals("AssemblyTrademark")) {
-            assemblyInfo.setTrademark(value);
-        } else if(name.equals("AssemblyCulture")) {
-            assemblyInfo.setCulture(value);
-        } else if(name.equals("AssemblyVersion")) {
-            assemblyInfo.setVersion(value);
-        } else if(name.equals("AssemblyConfiguration")) {
-            assemblyInfo.setConfiguration(value);
-        } else if(name.equals("AssemblyKeyFile")) {
-            assemblyInfo.setConfiguration(value);
-        } else if(name.equals("AssemblyKeyName")) {
-            assemblyInfo.setConfiguration(value);
+    /**
+     * Sets the specified value within the specified assembly info
+     *
+     * @param assemblyInfo the assembly info to set information on
+     * @param name the name of the assembly info field: AssemblyTitle, AssemblyDescription, ...
+     * @param value the value associated with the specified name
+     * @throws IOException if the assembly info is invalid
+     */
+    private void setAssemblyInfo( AssemblyInfo assemblyInfo, String name, String value )
+        throws IOException
+    {
+        if ( !name.startsWith( "Assembly" ) )
+        {
+            throw new IOException(
+                "NMAVEN-022-001: Invalid assembly info parameter: Name = " + name + ", Value = " + value );
+        }
+        if ( name.equals( "AssemblyDescription" ) )
+        {
+            assemblyInfo.setDescription( value );
+        }
+        else if ( name.equals( "AssemblyTitle" ) )
+        {
+            assemblyInfo.setTitle( value );
+        }
+        else if ( name.equals( "AssemblyCompany" ) )
+        {
+            assemblyInfo.setCompany( value );
+        }
+        else if ( name.equals( "AssemblyProduct" ) )
+        {
+            assemblyInfo.setProduct( value );
+        }
+        else if ( name.equals( "AssemblyCopyright" ) )
+        {
+            assemblyInfo.setCopyright( value );
+        }
+        else if ( name.equals( "AssemblyTrademark" ) )
+        {
+            assemblyInfo.setTrademark( value );
+        }
+        else if ( name.equals( "AssemblyCulture" ) )
+        {
+            assemblyInfo.setCulture( value );
+        }
+        else if ( name.equals( "AssemblyVersion" ) )
+        {
+            assemblyInfo.setVersion( value );
+        }
+        else if ( name.equals( "AssemblyConfiguration" ) )
+        {
+            assemblyInfo.setConfiguration( value );
+        }
+        else if ( name.equals( "AssemblyKeyFile" ) )
+        {
+            assemblyInfo.setConfiguration( value );
+        }
+        else if ( name.equals( "AssemblyKeyName" ) )
+        {
+            assemblyInfo.setConfiguration( value );
         }
     }
 

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java Mon Apr 23 16:28:17 2007
@@ -86,11 +86,14 @@
             }
         }
     }
-
+    
+    /**
+     * @see AssemblyInfoMarshaller#unmarshall(java.io.InputStream)
+     */
     public AssemblyInfo unmarshall( InputStream inputStream )
         throws IOException
     {
-        return null;
+        throw new IOException("This method is not implemented");
     }
 
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java Mon Apr 23 16:28:17 2007
@@ -88,10 +88,13 @@
         }
     }
 
+    /**
+     * @see AssemblyInfoMarshaller#unmarshall(java.io.InputStream)
+     */    
     public AssemblyInfo unmarshall( InputStream inputStream )
         throws IOException
     {
-        return null;
+        throw new IOException("This method is not implemented");
     }
     
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/package.html
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/package.html?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/package.html (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/package.html Mon Apr 23 16:28:17 2007
@@ -4,20 +4,23 @@
 <!--
 
   @(#)package.html
+  
+   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
 
-   Copyright 2006 Shane Isbell
+     http://www.apache.org/licenses/LICENSE-2.0
 
-   Licensed 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.
+   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.
 
 -->
 </head>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/package.html
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/package.html?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/package.html (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/package.html Mon Apr 23 16:28:17 2007
@@ -4,20 +4,23 @@
 <!--
 
   @(#)package.html
+  
+   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
 
-   Copyright 2006 Shane Isbell
+     http://www.apache.org/licenses/LICENSE-2.0
 
-   Licensed 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.
+   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.
 
 -->
 </head>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/pom.xml?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/pom.xml Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+<?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="http://maven.apache.org/POM/4.0.0" 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>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenRepositoryRegistry.java Mon Apr 23 16:28:17 2007
@@ -22,7 +22,6 @@
 
 import java.io.IOException;
 
-
 /**
  * @author Shane Isbell
  */

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/Version.java Mon Apr 23 16:28:17 2007
@@ -18,9 +18,13 @@
  */
 package org.apache.maven.dotnet;
 
+/**
+ * Provides access to the major, minor, build and revision version information.
+ *
+ * @author Shane Isbell
+ */
 public class Version
 {
-
     private int major;
 
     private int minor;

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/package.html
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/package.html?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/package.html (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/package.html Mon Apr 23 16:28:17 2007
@@ -4,20 +4,22 @@
 <!--
 
   @(#)package.html
+   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
 
-   Copyright 2006 Shane Isbell
+     http://www.apache.org/licenses/LICENSE-2.0
 
-   Licensed 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.
+   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.
 
 -->
 </head>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml Mon Apr 23 16:28:17 2007
@@ -24,7 +24,25 @@
     <groupId>NMaven.Plugin</groupId>
     <artifactId>NMaven.Plugin.Solution</artifactId>
     <version>0.14</version>
-    <type>exe</type>
+    <type>netplugin</type>
     <profile>withIde</profile>
+  </netDependency>
+  <netDependency>
+    <groupId>NMaven.Plugin</groupId>
+    <artifactId>NMaven.Plugin</artifactId>
+    <version>0.14</version>
+    <type>library</type>
+  </netDependency>
+  <netDependency>
+    <groupId>NMaven.Plugin</groupId>
+    <artifactId>NMaven.Plugin.Runner</artifactId>
+    <version>0.14</version>
+    <type>exe</type>
+  </netDependency>
+  <netDependency>
+    <groupId>NMaven.Plugin</groupId>
+    <artifactId>NMaven.Plugin.Loader</artifactId>
+    <version>0.14</version>
+    <type>exe</type>
   </netDependency>
 </netDependencies>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+<?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="http://maven.apache.org/POM/4.0.0" 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>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java Mon Apr 23 16:28:17 2007
@@ -1,7 +1,30 @@
+/*
+ * 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.embedder;
 
 import java.util.Set;
 
+/**
+ * Provides web services for interacting with the maven embedder.
+ *
+ * @author Shane Isbell
+ */
 public interface MavenEmbedderService
 {
 
@@ -11,11 +34,27 @@
     String ROLE = MavenEmbedderService.class.getName();
 
     /**
+     * Executes the specified maven execute request, which is a request to execute a goal on a pom file. This method
+     * is asynchronous and must return immediately.
      *
-     * @param request
+     * @param request the maven execute request
      */
     void execute( MavenExecutionRequest request );
 
-    Set<MavenProject> getMavenProjectsFor(String basedir);
+    /**
+     * Returns a set of maven projects that exist under (recursive) the base directory.
+     *
+     * @param basedir the base directory from which to look for pom files
+     * @return a set of maven projects that exist under (recursive) the base directory
+     */
+    Set<MavenProject> getMavenProjectsFor( String basedir );
+
+    /**
+     * Returns a set of .NET artifacts that exist within the local maven repository. To be part of the returned set, the following
+     * condition must be met: artifact packaging type must be an element of {library, nar, exe, winexe, netplugin, netmodule}.
+     *
+     * @return a set of .NET artifacts that exist within the local maven repository
+     */
+    Set<Artifact> getRepositoryArtifacts();
 
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenExecutionRequest.java Mon Apr 23 16:28:17 2007
@@ -1,8 +1,31 @@
+/*
+ * 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.embedder;
 
 import org.codehaus.xfire.aegis.type.java5.*;
 
-@XmlType(namespace="urn:maven-embedder")
+/**
+ * Provides services for obtaining information about the client execution request for the maven embedder.
+ *
+ * @author Shane Isbell
+ */
+@XmlType(namespace = "urn:maven-embedder")
 public interface MavenExecutionRequest
 {
 
@@ -11,19 +34,49 @@
      */
     String ROLE = MavenExecutionRequest.class.getName();
 
-    @XmlElement(name="pomFile", namespace="urn:maven-embedder")
+    /**
+     * Returns the pom file that the maven embedder should execute.
+     *
+     * @return the pom file that the maven embedder should execute
+     */
+    @XmlElement(name = "pomFile", namespace = "urn:maven-embedder")
     String getPomFile();
 
-    void setPomFile(java.lang.String string);
+    /**
+     *  Sets the pom file that the maven embedder should execute.
+     *
+     * @param string the pom file that the maven embedder should execute
+     */
+    void setPomFile( java.lang.String string );
 
-    @XmlElement(name="goal", namespace="urn:maven-embedder")
+    /**
+     * Returns the goal that the maven embedder should execute (install, clean, etc).
+     *
+     * @return the goal that the maven embedder should execute (install, clean, etc)
+     */
+    @XmlElement(name = "goal", namespace = "urn:maven-embedder")
     String getGoal();
-    
-    void setGoal(String goal);
 
-     @XmlElement(name="loggerPort", namespace="urn:maven-embedder")
+    /**
+     * Sets the goal that the maven embedder should execute (install, clean, etc).
+     *
+     * @param goal the goal that the maven embedder should execute (install, clean, etc)
+     */
+    void setGoal( String goal );
+
+    /**
+     * Returns  the socket port (of the requesting client) that the maven embedder should write its log messages to.
+     *
+     * @return  the socket port (of the requesting client) that the maven embedder should write its log messages to
+     */
+    @XmlElement(name = "loggerPort", namespace = "urn:maven-embedder")
     int getLoggerPort();
 
-    void setLoggerPort(int port);
+    /**
+     * Sets the socket port (of the requesting client) that the maven embedder should write its log messages to.
+     *
+     * @param port the socket port (of the requesting client) that the maven embedder should write its log messages to
+     */
+    void setLoggerPort( int port );
 
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenProject.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenProject.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenProject.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenProject.java Mon Apr 23 16:28:17 2007
@@ -1,10 +1,35 @@
+/*
+ * 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.embedder;
 
 import java.util.Set;
+
 import org.codehaus.xfire.aegis.type.java5.*;
 
-@XmlType(namespace="urn:maven-embedder")
-public interface MavenProject extends Comparable
+/**
+ * Provides web services for obtaining maven project information.
+ *
+ * @author Shane Isbell
+ */
+@XmlType(namespace = "urn:maven-embedder")
+public interface MavenProject
+    extends Comparable
 {
 
     /**
@@ -12,21 +37,57 @@
      */
     String ROLE = MavenProject.class.getName();
 
-    @XmlElement(name="pomPath", namespace="urn:maven-embedder")
+    /**
+     * Returns the path to the maven project's pom.
+     *
+     * @return the path to the maven project's pom
+     */
+    @XmlElement(name = "pomPath", namespace = "urn:maven-embedder")
     String getPomPath();
 
-    @XmlElement(name="groupId", namespace="urn:maven-embedder")
+    /**
+     * Returns the group id of the maven project.
+     *
+     * @return the group id of the maven project.
+     */
+    @XmlElement(name = "groupId", namespace = "urn:maven-embedder")
     String getGroupId();
 
-    @XmlElement(name="artifactId", namespace="urn:maven-embedder")
+    /**
+     * Returns the artifact id of the maven project.
+     *
+     * @return the artifact id of the maven project
+     */
+    @XmlElement(name = "artifactId", namespace = "urn:maven-embedder")
     String getArtifactId();
 
-    @XmlElement(name="version", namespace="urn:maven-embedder")
+    /**
+     * Returns the version of the maven project.
+     *
+     * @return the version of the maven project
+     */
+    @XmlElement(name = "version", namespace = "urn:maven-embedder")
     String getVersion();
 
-    @XmlElement(name="mavenProjects", namespace="urn:maven-embedder")
+    /**
+     * Returns a set of maven project children (typically the modules of a parent pom).
+     *
+     * @return a set of maven project children
+     */
+    @XmlElement(name = "mavenProjects", namespace = "urn:maven-embedder")
     Set<MavenProject> getMavenProjects();
 
-    @XmlElement(name="isOrphaned", namespace="urn:maven-embedder")
+    /**
+     * Returns true if both of the following conditions apply:
+     * 1) the project is not in the root directory AND
+     * 2) the project is not attached (as a module) to a pom that exists in the root directory,
+     * otherwise returns false.
+     *
+     * @return true if both of the following conditions apply:
+     * 1) the project is not in the root directory AND
+     * 2) the project is not attached (as a module) to a pom that exists in the root directory,
+     * otherwise returns false.
+     */
+    @XmlElement(name = "isOrphaned", namespace = "urn:maven-embedder")
     boolean isOrphaned();
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.embedder.impl;
 
 import java.util.List;
@@ -10,6 +28,7 @@
 import org.apache.maven.dotnet.embedder.MavenEmbedderService;
 import org.apache.maven.dotnet.embedder.MavenExecutionRequest;
 import org.apache.maven.dotnet.embedder.MavenProject;
+import org.apache.maven.dotnet.embedder.Artifact;
 import org.apache.maven.dotnet.embedder.logger.SocketLoggerManager;
 import org.apache.maven.dotnet.embedder.logger.SocketLogger;
 import org.apache.maven.embedder.MavenEmbedder;
@@ -26,24 +45,37 @@
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.util.DirectoryScanner;
 
+/**
+ * Provides an implementation of the maven embedder service.
+ *
+ * @author Shane Isbell
+ */
 public final class MavenEmbedderServiceImpl
     extends AbstractLogEnabled
     implements MavenEmbedderService, Initializable, Disposable
 {
 
+    /**
+     * The maven embedder instance
+     */
     private MavenEmbedder embedder;
 
+    /**
+     * Constructor. This method is intended to by invoked by xfire, not by the application developer.
+     */
     public MavenEmbedderServiceImpl()
     {
     }
 
+    /**
+     * @see MavenEmbedderService#execute(org.apache.maven.dotnet.embedder.MavenExecutionRequest)
+     */
     public void execute( final MavenExecutionRequest request )
     {
         new Thread( new Runnable()
         {
             public void run()
             {
-                System.out.println( "PORT = " + request.getLoggerPort() );
                 if ( request.getLoggerPort() <= 0 )
                 {
                     resetSocket( 9099 );
@@ -65,6 +97,18 @@
         } ).start();
     }
 
+    /**
+     * @see org.apache.maven.dotnet.embedder.MavenEmbedderService#getRepositoryArtifacts()
+     */
+    public Set<Artifact> getRepositoryArtifacts()
+    {
+        File localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" );
+        return getArtifactsFrom( localRepository.getAbsolutePath(), "**/*.pom" );
+    }
+
+    /**
+     * @see MavenEmbedderService#getMavenProjectsFor(String)
+     */
     public Set<org.apache.maven.dotnet.embedder.MavenProject> getMavenProjectsFor( String basedir )
     {
         Set<MavenProject> allMavenProjects = getMavenProjectsFrom( basedir, "**/*pom*.xml" );
@@ -83,6 +127,9 @@
         return mavenProjects;
     }
 
+    /**
+     * @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable#initialize()
+     */
     public void initialize()
     {
         ClassWorld classWorld = new ClassWorld();
@@ -99,8 +146,8 @@
         configuration.setLocalRepository(
             new File( System.getProperty( "user.home" ) + File.separator + ".m2/repository" ) );
 
-        File userLoc = new File( System.getProperty( "user.home" ), ".m2" );
-        File userSettingsPath = new File( userLoc, "settings.xml" );
+        File localRepository = new File( System.getProperty( "user.home" ), ".m2" );
+        File userSettingsPath = new File( localRepository, "settings.xml" );
         configuration.setUserSettingsFile( userSettingsPath );
         configuration.setMavenEmbedderLogger( null );
 
@@ -114,6 +161,9 @@
         }
     }
 
+    /**
+     * @see org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable#dispose()
+     */
     public void dispose()
     {
         try
@@ -126,6 +176,11 @@
         }
     }
 
+    /**
+     * Resets the port that the socket logger will use to write out its log messages.
+     *
+     * @param port the socket logger port
+     */
     private void resetSocket( int port )
     {
         SocketLoggerManager socketLoggerManager =
@@ -135,12 +190,18 @@
         {
             socketLogger.setHandlerFor( port );
         }
-        catch ( IOException e )
+        catch ( IOException e )//TODO: Throw this
         {
             e.printStackTrace();
         }
     }
 
+    /**
+     * Returns a set of all maven projects, including the specified maven projects and their child projects.
+     *
+     * @param mavenProjects the maven projects
+     * @return a set of all maven projects, including child projects of the specified maven projects
+     */
     private Set<MavenProject> getFlatSetFor( Set<MavenProject> mavenProjects )
     {
         Set<MavenProject> flatSet = new HashSet<MavenProject>();
@@ -152,6 +213,13 @@
         return flatSet;
     }
 
+    /**
+     * Returns a set of maven projects that follow the specified pattern under the specified root directory.
+     *
+     * @param rootDirectory the root directory from which to look for pom files
+     * @param pattern the pattern of the pom files
+     * @return a set of maven projects that follow the specified pattern under the specified root directory
+     */
     private Set<MavenProject> getMavenProjectsFrom( String rootDirectory, String pattern )
     {
         DirectoryScanner scanner = new DirectoryScanner();
@@ -168,11 +236,11 @@
             {
                 model = embedder.readModel( new File( rootDirectory, pomFile ) );
             }
-            catch ( XmlPullParserException e )
+            catch ( XmlPullParserException e )//TODO: throw
             {
                 e.printStackTrace();
             }
-            catch ( IOException e )
+            catch ( IOException e )//TODO: throw
             {
                 e.printStackTrace();
             }
@@ -189,6 +257,54 @@
         return mavenProjects;
     }
 
+    /**
+     * Returns a set of artifact that follow the specified pattern under the specified root directory.
+     * For this directory, the root directory is most likely the root local maven repository.
+     *
+     * @param rootDirectory the root directory from which to look for artifacts
+     * @param pattern the pattern of the pom files
+     * @return a set of artifacts that follow the specified pattern under the specified root directory
+     */
+    private Set<Artifact> getArtifactsFrom( String rootDirectory, String pattern )
+    {
+        DirectoryScanner scanner = new DirectoryScanner();
+        scanner.setBasedir( rootDirectory );
+        scanner.setIncludes( new String[]{pattern} );
+        scanner.scan();
+
+        Set<Artifact> artifacts = new HashSet<Artifact>();
+
+        for ( String pomFile : scanner.getIncludedFiles() )
+        {
+            ArtifactImpl artifact = new ArtifactImpl();
+            Model model = null;
+            try
+            {
+                model = embedder.readModel( new File( rootDirectory, pomFile ) );
+            }
+            catch ( XmlPullParserException e )
+            {
+                e.printStackTrace();
+            }
+            catch ( IOException e )
+            {
+                e.printStackTrace();
+            }
+            if ( model != null && ( model.getPackaging().equals( "library" ) || model.getPackaging().equals( "exe" ) ||
+                model.getPackaging().equals( "netmodule" ) ||
+                model.getPackaging().equals( "winexe" ) ) ) //TODO: Add nar and netplugin types
+            {
+                artifact.setArtifactId( model.getArtifactId() );
+                artifact.setGroupId( model.getGroupId() );
+                artifact.setVersion( model.getVersion() );
+                artifact.setPomPath( new File( rootDirectory, pomFile ).getAbsolutePath() );
+                artifact.setModel( model );
+                artifacts.add( artifact );
+            }
+        }
+        return artifacts;
+    }
+
     private MavenProject getMavenProjectForPomFile( File pomFile, Set<MavenProject> allMavenProjects )
     {
         for ( MavenProject mavenProject : allMavenProjects )
@@ -219,6 +335,12 @@
         return attachedMavenProjects;
     }
 
+    /**
+     * Prints out the maven project artifact ids for the specified maven projects, with indents for children projects
+     *
+     * @param mavenProjects the maven projects to print information about
+     * @param indent the number of dashes to use for each child node iteration
+     */
     private void printProjects( Set<MavenProject> mavenProjects, int indent )
     {
         StringBuffer dashes = new StringBuffer();

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenExecutionRequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenExecutionRequestImpl.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenExecutionRequestImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenExecutionRequestImpl.java Mon Apr 23 16:28:17 2007
@@ -1,7 +1,30 @@
+/*
+ * 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.embedder.impl;
 
 import org.apache.maven.dotnet.embedder.MavenExecutionRequest;
 
+/**
+ * Provides an implementation of the MavenExecutionRequest.
+ *
+ * @author Shane Isbell
+ */
 public class MavenExecutionRequestImpl
     implements MavenExecutionRequest
 
@@ -11,6 +34,13 @@
     private String goal;
 
     private int loggerPort;
+
+    /**
+     * Constructor. This method is intended to by invoked by xfire, not by the application developer.
+     */
+    public MavenExecutionRequestImpl()
+    {
+    }
 
     public String getPomFile()
     {

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenProjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenProjectImpl.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenProjectImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenProjectImpl.java Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.embedder.impl;
 
 import org.apache.maven.dotnet.embedder.MavenProject;
@@ -5,6 +23,11 @@
 
 import java.util.Set;
 
+/**
+ * Provides an implementation of the MavenProject.
+ *
+ * @author Shane Isbell
+ */
 public class MavenProjectImpl
     implements MavenProject
 {
@@ -22,6 +45,13 @@
     private Model model;
 
     private boolean isOrphaned = false;
+
+    /**
+     * Constructor. This method is intended to by invoked by xfire, not by the application developer.
+     */    
+    public MavenProjectImpl()
+    {
+    }
 
     public Set<MavenProject> getMavenProjects()
     {

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/MavenFormatter.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/MavenFormatter.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/MavenFormatter.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/MavenFormatter.java Mon Apr 23 16:28:17 2007
@@ -1,13 +1,45 @@
+/*
+ * 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.embedder.logger;
 
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
+/**
+ * Provides services for formatting log records in the standard maven format: [LOGLEVEL] message.
+ *
+ * @author Shane Isbell
+ */
 public class MavenFormatter
     extends Formatter
 {
+    /**
+     * The line separator appropriate for the target platform.
+     */
     private static String lineSeparator = System.getProperty( "line.separator" );
 
+    /**
+     * Formats the specified log record as the standard maven format: [LOGLEVEL] message.
+     *
+     * @param logRecord the log record to format
+     * @return the specified log record as the standard maven format: [LOGLEVEL] message
+     */
     public synchronized String format( LogRecord logRecord )
     {
         StringBuffer sb = new StringBuffer();

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLogger.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLogger.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLogger.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLogger.java Mon Apr 23 16:28:17 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.embedder.logger;
 
 import org.codehaus.plexus.logging.AbstractLogger;
@@ -5,23 +23,45 @@
 
 import java.io.IOException;
 import java.util.logging.SocketHandler;
-import java.util.logging.LogManager;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 
+/**
+ * Provides logging services for writing log messages over a socket port.
+ *
+ * @author Shane Isbell
+ * TODO: This class needs a lot more work. Currently only support INFO messages.
+ */
 public class SocketLogger
     extends AbstractLogger
 {
+    /**
+     * The underlying JDK logger
+     */
     private java.util.logging.Logger logger;
 
+    /**
+     * Constructor. This method is intended to by invoked by an instance of the org.codehaus.plexus.logging.LoggerManager
+     * class, not by the application developer.
+     *
+     * @param threshold the threshold for the logger. If the log message level is below this defined level, the logger
+     *                  will not write out the log.
+     */
     public SocketLogger( int threshold )
     {
         super( threshold, "SocketLogger" );
         logger = java.util.logging.Logger.getAnonymousLogger();
-        logger.setLevel( Level.INFO );
-        this.setThreshold( org.codehaus.plexus.logging.Logger.LEVEL_INFO);
+        logger.setLevel( Level.INFO );//TODO: This should use the specified threshold value.
+        this.setThreshold( org.codehaus.plexus.logging.Logger.LEVEL_INFO );
     }
 
+    /**
+     * Sets a socket handler on the logger for the specified port. The host will be local. The application may
+     * re-invoke this method to set a new port for the logger.
+     *
+     * @param port the socket port of the loggers socket handler.
+     * @throws IOException if there is a problem binding to the specified port
+     */
     public synchronized void setHandlerFor( int port )
         throws IOException
     {

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLoggerManager.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLoggerManager.java?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLoggerManager.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/logger/SocketLoggerManager.java Mon Apr 23 16:28:17 2007
@@ -1,15 +1,42 @@
+/*
+ * 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.embedder.logger;
 
 import org.codehaus.plexus.logging.BaseLoggerManager;
 import org.codehaus.plexus.logging.Logger;
 
-import java.io.IOException;
-
+/**
+ * Provides services for retrieving a singleton socket logger.
+ *
+ * @author Shane Isbell
+ */
 public class SocketLoggerManager
     extends BaseLoggerManager
 {
+    /**
+     * The singleton socket logger.
+     */
     private static SocketLogger logger;
 
+    /**
+     * Constructor. This method is intended to by invoked by the plexus-container, not by the application developer.
+     */
     public SocketLoggerManager()
     {
         if ( logger != null )
@@ -20,12 +47,24 @@
         logger = new SocketLogger( getThreshold() );
     }
 
+    /**
+     * Returns the singleton socket logger
+     *
+     * @param key this value is ignored
+     * @return the singleton socket logger
+     */
     public Logger createLogger( String key )
     {
         return logger;
-
     }
 
+    /**
+     * Returns the singleton socket logger
+     *
+     * @param role this value is ignored.
+     * @param roleHint this value is ignored
+     * @return the singleton socket logger
+     */
     public Logger getLoggerForComponent( String role, String roleHint )
     {
         return logger;

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=531653&r1=531652&r2=531653
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/resources/META-INF/plexus/components.xml Mon Apr 23 16:28:17 2007
@@ -9,8 +9,12 @@
       <implementation>org.apache.maven.dotnet.embedder.impl.MavenExecutionRequestImpl</implementation>
     </component>
     <component>
-      <role>org.apache.maven.dotnet.embedder.MavenProjectt</role>
+      <role>org.apache.maven.dotnet.embedder.MavenProject</role>
       <implementation>org.apache.maven.dotnet.embedder.impl.MavenProjectImpl</implementation>
+    </component>
+    <component>
+      <role>org.apache.maven.dotnet.embedder.Artifact</role>
+      <implementation>org.apache.maven.dotnet.embedder.impl.ArtifactImpl</implementation>
     </component>
     <component>
       <role>org.codehaus.xfire.plexus.config.ConfigurationService</role>



Mime
View raw message