incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r520983 [6/7] - in /incubator/nmaven/trunk: ./ assemblies/ assemblies/NMaven.Core/ assemblies/NMaven.Core/src/ assemblies/NMaven.Core/src/main/ assemblies/NMaven.Core/src/main/csharp/ assemblies/NMaven.Core/src/main/csharp/Core/ assemblies/...
Date Wed, 21 Mar 2007 19:50:56 GMT
Modified: incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Wed Mar 21 12:50:36 2007
@@ -1,236 +1,246 @@
 <component-set>
-    <components>
-        <component>
-            <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-            <implementation>org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout</implementation>
-        </component>
-        <component>
-            <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-            <role-hint>nar</role-hint>
-            <implementation>
-                org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-            </implementation>
-            <configuration>
-                <phases>
-                    <validate>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
-                        org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
-                        org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
-                    </validate>
-                    <generate-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
-                    </generate-sources>
-                    <process-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
-                    </process-sources>
-                    <process-resources>
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate
-                    </process-resources>
-                    <compile>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
-                    </compile>
-                    <process-classes>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
-                    </process-classes>
-                    <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
-                    <install>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:install,
-                    </install>
-                    <package>org.apache.maven.dotnet.plugins:maven-webapp-plugin:package</package>
-                    <deploy>org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy</deploy>
-                </phases>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-            <role-hint>module</role-hint>
+  <components>
+    <component>
+      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+      <implementation>org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout</implementation>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>nar</role-hint>
+      <implementation>
+        org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+      </implementation>
+      <configuration>
+        <phases>
+          <validate>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
+            org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
+            org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
+          </validate>
+          <generate-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
+          </generate-sources>
+          <process-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
+          </process-sources>
+          <process-resources>
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate
+          </process-resources>
+          <compile>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
+          </compile>
+          <process-classes>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
+          </process-classes>
+          <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
+          <install>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:install,
+          </install>
+          <package>org.apache.maven.dotnet.plugins:maven-webapp-plugin:package</package>
+          <deploy>org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy</deploy>
+        </phases>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>module</role-hint>
 
-            <implementation>
-                org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-            </implementation>
-            <configuration>
-                <phases>
-                    <validate>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
-                        org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
-                        org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
-                    </validate>
-                    <process-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
-                    </process-sources>
-                    <process-resources>
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate
-                    </process-resources>
-                    <compile>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
-                    </compile>
-                    <process-classes>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
-                    </process-classes>
-                    <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
-                    <install>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:install,
-                    </install>
-                </phases>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-            <role-hint>library</role-hint>
+      <implementation>
+        org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+      </implementation>
+      <configuration>
+        <phases>
+          <validate>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
+            org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
+            org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
+          </validate>
+          <process-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
+          </process-sources>
+          <process-resources>
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate
+          </process-resources>
+          <compile>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
+          </compile>
+          <process-classes>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
+          </process-classes>
+          <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
+          <package>org.apache.maven.dotnet.plugins:maven-link-plugin:package</package>
+          <install>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:install,
+          </install>
+        </phases>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>library</role-hint>
 
-            <implementation>
-                org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-            </implementation>
-            <configuration>
-                <phases>
-                    <validate>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
-                        org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve ,
-                        org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
-                    </validate>
-                    <generate-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
-                    </generate-sources>
-                    <process-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
-                    </process-sources>
-                    <process-resources>
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate,
-                    </process-resources>
-                    <compile>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
-                    </compile>
-                    <process-classes>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
-                    </process-classes>
-                    <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
-                    <install>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:install,
-                    </install>
-                </phases>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-            <role-hint>exe</role-hint>
+      <implementation>
+        org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+      </implementation>
+      <configuration>
+        <phases>
+          <validate>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
+            org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve ,
+            org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
+          </validate>
+          <generate-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
+          </generate-sources>
+          <process-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
+          </process-sources>
+          <process-resources>
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate,
+          </process-resources>
+          <compile>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
+          </compile>
+          <process-classes>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
+          </process-classes>
+          <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
+          <install>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:install,
+          </install>
+        </phases>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>exe</role-hint>
 
-            <implementation>
-                org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-            </implementation>
-            <configuration>
-                <phases>
-                    <validate>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
-                        org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
-                        org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
-                    </validate>
-                    <generate-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
-                    </generate-sources>
-                    <process-sources>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
-                    </process-sources>
-                    <process-resources>
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
-                        org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate,
-                    </process-resources>
-                    <compile>
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
-                        org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
-                    </compile>
-                    <process-classes>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
-                    </process-classes>
-                    <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
-                    <install>
-                        org.apache.maven.dotnet.plugins:maven-install-plugin:install,
-                    </install>
-                </phases>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-            <role-hint>module</role-hint>
-            <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-            <configuration>
-                <extension>netmodule</extension>
-                <type>module</type>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-            <role-hint>exe.config</role-hint>
-            <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-            <configuration>
-                <extension>exe.config</extension>
-                <type>exe.config</type>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-            <role-hint>library</role-hint>
-            <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-            <configuration>
-                <extension>dll</extension>
-                <type>library</type>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-            <role-hint>winexe</role-hint>
-            <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-            <configuration>
-                <extension>exe</extension>
-                <type>winexe</type>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-            <role-hint>nar</role-hint>
-            <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-            <configuration>
-                <type>nar</type>
-            </configuration>
-        </component>
-        <component>
-            <role>org.apache.maven.dotnet.executable.CapabilityMatcher</role>
-            <implementation>org.apache.maven.dotnet.executable.impl.CapabilityMatcherImpl</implementation>
-            <requirements>
-                <requirement>
-                    <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
-                </requirement>
-            </requirements>
-        </component>
-        <component>
-            <role>org.apache.maven.dotnet.vendor.VendorInfoRepository</role>
-            <implementation>org.apache.maven.dotnet.vendor.impl.VendorInfoRepositoryImpl</implementation>
-            <requirements>
-                <requirement>
-                    <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
-                </requirement>
-            </requirements>
-        </component>
-        <component>
-            <role>org.apache.maven.dotnet.vendor.StateMachineProcessor</role>
-            <implementation>org.apache.maven.dotnet.vendor.impl.StateMachineProcessorImpl</implementation>
-            <requirements>
-                <requirement>
-                    <role>org.apache.maven.dotnet.vendor.VendorInfoRepository</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
-                </requirement>
-            </requirements>
-        </component>
-    </components>
+      <implementation>
+        org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+      </implementation>
+      <configuration>
+        <phases>
+          <validate>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
+            org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
+            org.apache.maven.dotnet.plugins:maven-settings-plugin:generate-settings
+          </validate>
+          <generate-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
+          </generate-sources>
+          <process-sources>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:process-test-sources
+          </process-sources>
+          <process-resources>
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:copy-resources,
+            org.apache.maven.dotnet.plugins:maven-resgen-plugin:generate,
+          </process-resources>
+          <compile>
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
+            org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
+          </compile>
+          <process-classes>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
+          </process-classes>
+          <test>org.apache.maven.dotnet.plugins:maven-test-plugin:test</test>
+          <install>
+            org.apache.maven.dotnet.plugins:maven-install-plugin:install,
+          </install>
+        </phases>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>module</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <extension>netmodule</extension>
+        <type>module</type>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>exe.config</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <extension>exe.config</extension>
+        <type>exe.config</type>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>library</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <extension>dll</extension>
+        <type>library</type>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>winexe</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <extension>exe</extension>
+        <type>winexe</type>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>gac</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <extension>dll</extension>
+        <type>gac</type>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>nar</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>nar</type>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.dotnet.executable.CapabilityMatcher</role>
+      <implementation>org.apache.maven.dotnet.executable.impl.CapabilityMatcherImpl</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.dotnet.vendor.VendorInfoRepository</role>
+      <implementation>org.apache.maven.dotnet.vendor.impl.VendorInfoRepositoryImpl</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.dotnet.vendor.StateMachineProcessor</role>
+      <implementation>org.apache.maven.dotnet.vendor.impl.StateMachineProcessorImpl</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.dotnet.vendor.VendorInfoRepository</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
 </component-set>

Modified: incubator/nmaven/trunk/plugins/maven-install-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-install-plugin/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-install-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-install-plugin/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,18 +1,19 @@
-<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>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <version>0.14-SNAPSHOT</version>
-        <artifactId>maven-dotnet-plugins</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<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>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-install-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>maven-install-plugin</name>
-    <description>
-        Maven Plugin for .NET
-    </description>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-install-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-install-plugin</name>
+  <description>
+    Maven Plugin for .NET
+  </description>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>

Modified: incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java Wed Mar 21 12:50:36 2007
@@ -33,7 +33,9 @@
  * @requiresProject false
  */
 
-public class FileInstallerMojo extends AbstractMojo {
+public class FileInstallerMojo
+    extends AbstractMojo
+{
 
     /**
      * The maven project.
@@ -89,18 +91,17 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
-        try {
-            nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1000-001: Failed to create the repository registry for this plugin", e);
+    public void execute()
+        throws MojoExecutionException
+    {
+        artifactContext.init( project, localRepository );
+        try
+        {
+            artifactContext.getArtifactInstaller().installFile( groupId, artifactId, version, packaging, pomFile );
         }
-
-        artifactContext.init(project, localRepository);
-        try {
-            artifactContext.getArtifactInstaller().installFile(groupId, artifactId, version, packaging, pomFile);
-        } catch (org.apache.maven.artifact.installer.ArtifactInstallationException e) {
-            throw new MojoExecutionException("NMAVEN-1000-000: Failed to install artifact file", e);
+        catch ( org.apache.maven.artifact.installer.ArtifactInstallationException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1000-000: Failed to install artifact file", e );
         }
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Wed Mar 21 12:50:36 2007
@@ -23,14 +23,21 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.artifact.installer.ArtifactInstaller;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.dotnet.artifact.ArtifactContext;
+import org.apache.maven.dotnet.artifact.ArtifactType;
+import org.apache.maven.model.Dependency;
+
 import java.io.File;
+import java.util.List;
 
 /**
  * @goal install
  * @phase install
  */
-public class InstallerMojo extends AbstractMojo {
+public class InstallerMojo
+    extends AbstractMojo
+{
 
     /**
      * The maven project.
@@ -63,11 +70,49 @@
      */
     private ArtifactContext artifactContext;
 
-    public void execute() throws MojoExecutionException {
-        try {
-            artifactContext.getArtifactInstaller().installArtifact(project.getArtifact(), pomFile);
-        } catch (ArtifactInstallationException e) {
-            throw new MojoExecutionException("NMAVEN-1001-000: Failed to install artifacts", e);
+    public void execute()
+        throws MojoExecutionException
+    {
+        Artifact artifact = project.getArtifact();
+        try
+        {
+            artifactContext.getArtifactInstaller().installArtifact( artifact, pomFile );
+        }
+        catch ( ArtifactInstallationException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1001-000: Failed to install artifacts", e );
+        }
+
+        //To allow executables to be runnable from the repo
+        if ( artifact.getType().equals( ArtifactType.EXE.getArtifactTypeName() ) )
+        {
+            List<Dependency> dependencies = project.getDependencies();
+            try
+            {
+                artifactContext.getArtifactInstaller().installLibraryDependencies( artifact, dependencies );
+            }
+            catch ( ArtifactInstallationException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1001-002: Failed to install artifact file", e );
+            }
         }
+
+        //For the IDE: If we see a dll with same name as netmodule, copy dll to the local repo.
+        File linkedFile =
+            new File( artifact.getFile().getParent() + File.separatorChar + artifact.getArtifactId() + ".dll" );
+        if ( linkedFile.exists() && artifact.getType().equals( ArtifactType.MODULE.getArtifactTypeName() ) )
+        {
+            try
+            {
+                artifactContext.getArtifactInstaller().installFileWithNoPom( artifact.getGroupId(),
+                                                                             artifact.getArtifactId(),
+                                                                             artifact.getVersion(), linkedFile );
+            }
+            catch ( org.apache.maven.artifact.installer.ArtifactInstallationException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1001-001: Failed to install artifact file", e );
+            }
+        }
+
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java Wed Mar 21 12:50:36 2007
@@ -35,7 +35,9 @@
  * @phase process-classes
  */
 
-public class TargetModuleInstallerMojo extends AbstractMojo {
+public class TargetModuleInstallerMojo
+    extends AbstractMojo
+{
 
     /**
      * @component
@@ -62,18 +64,27 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
-        try {
+    public void execute()
+        throws MojoExecutionException
+    {
+        try
+        {
             nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1002-001: Failed to create the repository registry for this plugin", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-1002-001: Failed to create the repository registry for this plugin", e );
         }
 
-        artifactContext.init(project, localRepository);
-        try {
-            artifactContext.getArtifactInstaller().installNetModulesToTargetDirectory(project.getArtifact());
-        } catch (ArtifactInstallationException e) {
-            throw new MojoExecutionException("NMAVEN-1002-000: Failed to install artifacts into target directory", e);
+        artifactContext.init( project, localRepository );
+        try
+        {
+            artifactContext.getArtifactInstaller().installNetModulesToTargetDirectory( project.getArtifact() );
+        }
+        catch ( ArtifactInstallationException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1002-000: Failed to install artifacts into target directory", e );
         }
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-resgen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-resgen-plugin/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-resgen-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-resgen-plugin/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,37 +1,38 @@
-<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>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <version>0.14-SNAPSHOT</version>
-        <artifactId>maven-dotnet-plugins</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<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>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-resgen-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>maven-resgen-plugin</name>
-    <description>
-        Maven Plugin for .NET
-    </description>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.dotnet.plugins</groupId>
-                <artifactId>maven-resolver-plugin</artifactId>
-                <configuration>
-                    <netDependencies>
-                        <netDependencies>
-                            <groupId>org.apache.maven.bogus</groupId>
-                            <artifactId>test</artifactId>
-                            <version>1.0.0</version>
-                            <type>exe</type>
-                        </netDependencies>
-                    </netDependencies>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <distributionManagement>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-resgen-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-resgen-plugin</name>
+  <description>
+    Maven Plugin for .NET
+  </description>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-resolver-plugin</artifactId>
+        <configuration>
+          <netDependencies>
+            <netDependencies>
+              <groupId>org.apache.maven.bogus</groupId>
+              <artifactId>test</artifactId>
+              <version>1.0.0</version>
+              <type>exe</type>
+            </netDependencies>
+          </netDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>
       <name>NMaven Site</name>

Modified: incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceCopierMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceCopierMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceCopierMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceCopierMojo.java Wed Mar 21 12:50:36 2007
@@ -39,7 +39,9 @@
  * @goal copy-resources
  * @phase process-resources
  */
-public class ResourceCopierMojo extends AbstractMojo {
+public class ResourceCopierMojo
+    extends AbstractMojo
+{
 
     /**
      * The maven project.
@@ -49,58 +51,84 @@
      */
     private MavenProject project;
 
-    public void execute() throws MojoExecutionException {
+    public void execute()
+        throws MojoExecutionException
+    {
         String targetDirectory = project.getBuild().getDirectory();
         List<Resource> resources = project.getResources();
-        if(resources.isEmpty()) {
-            getLog().info("NMAVEN-1500-000: No resources found");
+        if ( resources.isEmpty() )
+        {
+            getLog().info( "NMAVEN-1500-000: No resources found" );
             return;
         }
-        for(Resource resource: resources) {
-            if(!new File(resource.getDirectory()).exists()) continue;
-            copyResourceDirectory(resource.getDirectory(), targetDirectory, resource.getIncludes(),
-                    resource.getExcludes());
-        }
-        try {
-            FileUtils.copyDirectory(new File(project.getBasedir() + File.separator + "src/main/config"),
-                    new File(project.getBuild().getDirectory()), "*.exe.config", null);
-        } catch (IOException e) {
-           throw new MojoExecutionException("NMAVEN-1500-004: Failed to copy config file.", e);
+        for ( Resource resource : resources )
+        {
+            if ( !new File( resource.getDirectory() ).exists() )
+            {
+                continue;
+            }
+            copyResourceDirectory( resource.getDirectory(), targetDirectory, resource.getIncludes(),
+                                   resource.getExcludes() );
+        }
+        try
+        {
+            FileUtils.copyDirectory( new File( project.getBasedir() + File.separator + "src/main/config" ),
+                                     new File( project.getBuild().getDirectory() ), "*.exe.config", null );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1500-004: Failed to copy config file.", e );
         }
     }
 
-    private void copyResourceDirectory(String sourceDirectory, String outputDirectory, List includes,
-                                       List excludes) throws MojoExecutionException {
+    private void copyResourceDirectory( String sourceDirectory, String outputDirectory, List includes, List excludes )
+        throws MojoExecutionException
+    {
         DirectoryScanner directoryScanner = new DirectoryScanner();
-        directoryScanner.setBasedir(sourceDirectory);
-        if(!includes.isEmpty()) directoryScanner.setIncludes(listAsStringArray(includes));
-        if(!excludes.isEmpty()) directoryScanner.setExcludes(listAsStringArray(excludes));
+        directoryScanner.setBasedir( sourceDirectory );
+        if ( !includes.isEmpty() )
+        {
+            directoryScanner.setIncludes( listAsStringArray( includes ) );
+        }
+        if ( !excludes.isEmpty() )
+        {
+            directoryScanner.setExcludes( listAsStringArray( excludes ) );
+        }
         directoryScanner.addDefaultExcludes();
         directoryScanner.scan();
         String[] files = directoryScanner.getIncludedFiles();
-        for (String file : files) {
-            File sourceFile = new File(sourceDirectory + File.separator + file);
+        for ( String file : files )
+        {
+            File sourceFile = new File( sourceDirectory + File.separator + file );
             File destinationFile =
-                    new File(outputDirectory + File.separator + "assembly-resources" + File.separator +  file);
-            try {
-                FileUtils.copyFile(sourceFile, destinationFile);
-                getLog().debug("NMAVEN-1500-001: Copied Resource File: Source File = " + sourceFile.getAbsolutePath() +
-                        ", Destination File = " + destinationFile.getAbsolutePath());
-            } catch (IOException e) {
-                throw new MojoExecutionException("NMAVEN-1500-002: Unable to copy resource file: Source File = " +
-                        sourceFile.getAbsolutePath(), e);
+                new File( outputDirectory + File.separator + "assembly-resources" + File.separator + file );
+            try
+            {
+                FileUtils.copyFile( sourceFile, destinationFile );
+                getLog().debug( "NMAVEN-1500-001: Copied Resource File: Source File = " + sourceFile.getAbsolutePath() +
+                    ", Destination File = " + destinationFile.getAbsolutePath() );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoExecutionException(
+                    "NMAVEN-1500-002: Unable to copy resource file: Source File = " + sourceFile.getAbsolutePath(), e );
             }
         }
-        getLog().info("NMAVEN-1500-003: Copied resource directory: Number of Resources = " + files.length
-            + ", Resource Directory = " + sourceDirectory
-            + ", Destination Directory = " + outputDirectory + File.separator + "assembly-resources");
+        getLog().info( "NMAVEN-1500-003: Copied resource directory: Number of Resources = " + files.length +
+            ", Resource Directory = " + sourceDirectory + ", Destination Directory = " + outputDirectory + File
+            .separator + "assembly-resources" );
     }
 
-    private String[] listAsStringArray(List list) {
-        if(list == null) return new String[0];
+    private String[] listAsStringArray( List list )
+    {
+        if ( list == null )
+        {
+            return new String[0];
+        }
         String[] target = new String[list.size()];
         int j = 0;
-        for(Iterator i = list.iterator(); i.hasNext(); j++) {
+        for ( Iterator i = list.iterator(); i.hasNext(); j++ )
+        {
             target[j] = (String) i.next();
         }
         return target;

Modified: incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Wed Mar 21 12:50:36 2007
@@ -40,7 +40,9 @@
  * @goal generate
  * @phase process-resources
  */
-public class ResourceGeneratorMojo extends AbstractMojo {
+public class ResourceGeneratorMojo
+    extends AbstractMojo
+{
 
     /**
      * @parameter expression="${settings.localRepository}"
@@ -72,7 +74,7 @@
     private String vendor;
 
     /**
-     * @parameter expression = "${frameworkVersion}" 
+     * @parameter expression = "${frameworkVersion}"
      */
     private String frameworkVersion;
 
@@ -96,61 +98,86 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
+    public void execute()
+        throws MojoExecutionException
+    {
 
-        if (System.getProperty("bootstrap") != null)
+        if ( System.getProperty( "bootstrap" ) != null )
+        {
             return;
+        }
 
-        File sourceDirectory = new File(project.getBuild().getDirectory() + File.separator + "assembly-resources"
-                + File.separator + "resgen");
-        if (!sourceDirectory.exists())
+        File sourceDirectory = new File(
+            project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator + "resgen" );
+        if ( !sourceDirectory.exists() )
+        {
             return;
+        }
 
-        try {
+        try
+        {
             nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1501-004: Failed to create the repository registry for this plugin", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-1501-004: Failed to create the repository registry for this plugin", e );
         }
 
         //resx.exe
         List<String> commands = new ArrayList<String>();
-        commands.add(sourceDirectory.getAbsolutePath());
-        commands.add(project.getBuild().getDirectory() + File.separator + "assembly-resources"
-                + File.separator + project.getArtifactId() + ".resx");
-        try {
+        commands.add( sourceDirectory.getAbsolutePath() );
+        commands.add( project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator +
+            project.getArtifactId() + ".resx" );
+        try
+        {
             VendorInfo vendorInfo = VendorInfo.Factory.createDefaultVendorInfo();
-            if(vendor != null) vendorInfo.setVendor(VendorFactory.createVendorFromName(vendor));
-            vendorInfo.setFrameworkVersion(frameworkVersion);
-            vendorInfo.setVendorVersion(vendorVersion);
-            netExecutableFactory.getNetExecutableFromRepository("NMaven.Utility.ResX", "resx",
-                    vendorInfo, project, localRepository, commands).execute();
-        } catch (PlatformUnsupportedException e) {
-            throw new MojoExecutionException("", e);
-        } catch(ExecutionException e) {
-            throw new MojoExecutionException("", e);
+            if ( vendor != null )
+            {
+                vendorInfo.setVendor( VendorFactory.createVendorFromName( vendor ) );
+            }
+            vendorInfo.setFrameworkVersion( frameworkVersion );
+            vendorInfo.setVendorVersion( vendorVersion );
+            netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Resx", vendorInfo,
+                                                                 project, localRepository, commands ).execute();
+        }
+        catch ( PlatformUnsupportedException e )
+        {
+            throw new MojoExecutionException( "", e );
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "", e );
         }
 
         //resgen.exe
-        FileUtils.mkdir(project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator
-                + "resource");
+        FileUtils.mkdir(
+            project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator + "resource" );
 
-        try {
-            netExecutableFactory.getNetExecutableFor(vendor, frameworkVersion, "RESGEN",
-                    project, getCommands(), netHome).execute();
-        } catch (ExecutionException e) {
-            throw new MojoExecutionException("NMAVEN-1501-002: Unable to execute resgen: Vendor = " + vendor
-                    + ", frameworkVersion = " + frameworkVersion, e);
-        } catch (PlatformUnsupportedException e) {
-            throw new MojoExecutionException("NMAVEN-1501-003: Platform Unsupported", e);
+        try
+        {
+            netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, "RESGEN", project, getCommands(),
+                                                      netHome ).execute();
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1501-002: Unable to execute resgen: Vendor = " + vendor +
+                ", frameworkVersion = " + frameworkVersion, e );
+        }
+        catch ( PlatformUnsupportedException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1501-003: Platform Unsupported", e );
         }
     }
 
-    public List<String> getCommands() throws MojoExecutionException {
+    public List<String> getCommands()
+        throws MojoExecutionException
+    {
         List<String> commands = new ArrayList<String>();
-        commands.add(project.getBuild().getDirectory() + File.separator + "assembly-resources"
-                + File.separator + project.getArtifactId() + ".resx");
-        commands.add(project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator
-                + "resource" + File.separator + project.getArtifactId() + ".resources");
+        commands.add( project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator +
+            project.getArtifactId() + ".resx" );
+        commands.add( project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator +
+            "resource" + File.separator + project.getArtifactId() + ".resources" );
         return commands;
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependency.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependency.java (original)
+++ incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependency.java Wed Mar 21 12:50:36 2007
@@ -18,7 +18,8 @@
  */
 package org.apache.maven.dotnet.plugin.resolver;
 
-public class NetDependency {
+public class NetDependency
+{
 
     private String version;
 
@@ -28,58 +29,86 @@
 
     private String type;
 
-    public String getVersion() {
+    public String getVersion()
+    {
         return version;
     }
 
-    public void setVersion(String version) {
+    public void setVersion( String version )
+    {
         this.version = version;
     }
 
-    public String getArtifactId() {
+    public String getArtifactId()
+    {
         return artifactId;
     }
 
-    public void setArtifactId(String artifactId) {
+    public void setArtifactId( String artifactId )
+    {
         this.artifactId = artifactId;
     }
 
-    public String getGroupId() {
+    public String getGroupId()
+    {
         return groupId;
     }
 
-    public void setGroupId(String groupId) {
+    public void setGroupId( String groupId )
+    {
         this.groupId = groupId;
     }
 
-    public String getType() {
+    public String getType()
+    {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType( String type )
+    {
         this.type = type;
     }
 
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
 
         final NetDependency that = (NetDependency) o;
 
-        if (!artifactId.equals(that.artifactId)) return false;
-        if (!groupId.equals(that.groupId)) return false;
-        if (type != null ? !type.equals(that.type) : that.type != null) return false;
-        if (!version.equals(that.version)) return false;
+        if ( !artifactId.equals( that.artifactId ) )
+        {
+            return false;
+        }
+        if ( !groupId.equals( that.groupId ) )
+        {
+            return false;
+        }
+        if ( type != null ? !type.equals( that.type ) : that.type != null )
+        {
+            return false;
+        }
+        if ( !version.equals( that.version ) )
+        {
+            return false;
+        }
 
         return true;
     }
 
-    public int hashCode() {
+    public int hashCode()
+    {
         int result;
         result = version.hashCode();
         result = 29 * result + artifactId.hashCode();
         result = 29 * result + groupId.hashCode();
-        result = 29 * result + (type != null ? type.hashCode() : 0);
+        result = 29 * result + ( type != null ? type.hashCode() : 0 );
         return result;
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java Wed Mar 21 12:50:36 2007
@@ -34,14 +34,18 @@
 import java.util.ArrayList;
 
 import org.apache.maven.dotnet.artifact.AssemblyResolver;
-import org.apache.maven.dotnet.artifact.impl.NetDependenciesRepository;
+import org.apache.maven.dotnet.artifact.NetDependenciesRepository;
+import org.apache.maven.dotnet.artifact.NetDependencyMatchPolicy;
+import org.apache.maven.dotnet.model.netdependency.NetDependency;
 
 /**
  * @author Shane Isbell
  * @goal resolve
  * @phase process-resources
  */
-public class NetDependencyResolverMojo extends AbstractMojo {
+public class NetDependencyResolverMojo
+    extends AbstractMojo
+{
     /**
      * The maven project.
      *
@@ -84,40 +88,90 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
-        if(System.getProperty("bootstrap") != null)  return;
+    public void execute()
+        throws MojoExecutionException
+    {
+        if ( System.getProperty( "bootstrap" ) != null )
+        {
+            return;
+        }
+
+        String profile = System.getProperty( "dependencyProfile" );
 
         RepositoryRegistry repositoryRegistry;
-        try {
+        try
+        {
             repositoryRegistry = nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1600-000: Failed to create the repository registry for this plugin", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-1600-000: Failed to create the repository registry for this plugin", e );
         }
 
-        if (netDependencies == null) netDependencies = new NetDependency[0];
+        if ( netDependencies == null )
+        {
+            netDependencies = new NetDependency[0];
+        }
         List<Dependency> dependencies = new ArrayList<Dependency>();
-        for (NetDependency netDependency : netDependencies) {
+        for ( NetDependency netDependency : netDependencies )
+        {
             Dependency dependency = new Dependency();
-            dependency.setGroupId(netDependency.getGroupId());
-            dependency.setArtifactId(netDependency.getArtifactId());
-            dependency.setVersion(netDependency.getVersion());
-            dependency.setScope(Artifact.SCOPE_RUNTIME);
-            dependency.setType(netDependency.getType());
-            dependencies.add(dependency);
-        }
-
-        NetDependenciesRepository repository = (NetDependenciesRepository) repositoryRegistry.find("net-dependencies");
-        dependencies.addAll(repository.getDependencies());
-        getLog().info("NMAVEN-1600-001: Found net dependencies: Number = " + dependencies.size());
-
-        try {
-            assemblyResolver.resolveTransitivelyFor(project, project.getArtifact(), dependencies,
-                    pomFile, localRepository, false);
-        } catch (ArtifactResolutionException e) {
-            throw new MojoExecutionException("NMAVEN-1600-002: Unable to resolve assemblies", e);
-        } catch (ArtifactNotFoundException e) {
-            throw new MojoExecutionException("NMAVEN-1600-003: Unable to resolve assemblies", e);
+            dependency.setGroupId( netDependency.getGroupId() );
+            dependency.setArtifactId( netDependency.getArtifactId() );
+            dependency.setVersion( netDependency.getVersion() );
+            dependency.setScope( Artifact.SCOPE_RUNTIME );
+            dependency.setType( netDependency.getType() );
+            dependencies.add( dependency );
+        }
+
+        NetDependenciesRepository repository =
+            (NetDependenciesRepository) repositoryRegistry.find( "net-dependencies" );
+        List<NetDependencyMatchPolicy> matchPolicies = new ArrayList<NetDependencyMatchPolicy>();
+        matchPolicies.add( new ProfileMatchPolicy( profile ) );
+        dependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
+        getLog().info( "NMAVEN-1600-001: Found net dependencies: Number = " + dependencies.size() );
+
+        try
+        {
+            assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), dependencies, pomFile,
+                                                     localRepository, false );
+        }
+        catch ( ArtifactResolutionException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1600-002: Unable to resolve assemblies", e );
         }
+        catch ( ArtifactNotFoundException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1600-003: Unable to resolve assemblies", e );
+        }
+    }
+
+    private class ProfileMatchPolicy
+        implements NetDependencyMatchPolicy
+    {
 
+        private String profile;
+
+        public ProfileMatchPolicy( String profile )
+        {
+            this.profile = profile;
+        }
+
+        public boolean match( NetDependency netDependency )
+        {
+            //If no profile is specified in net-dependencies.xml, it matches
+            if ( netDependency.getProfile() == null || netDependency.getProfile().trim().equals( "" ) )
+            {
+                return true;
+            }
+
+            if ( profile == null )
+            {
+                return false;
+            }
+
+            return profile.equals( netDependency.getProfile() );
+        }
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java Wed Mar 21 12:50:36 2007
@@ -33,12 +33,13 @@
 import org.apache.maven.dotnet.vendor.VendorInfo;
 
 /**
- *
  * @author Shane Isbell
  * @goal generate-settings
  * @phase validate
  */
-public class SettingsGeneratorMojo extends AbstractMojo {
+public class SettingsGeneratorMojo
+    extends AbstractMojo
+{
 
     /**
      * @parameter expression="${settings.localRepository}"
@@ -54,7 +55,7 @@
      */
     private MavenProject project;
 
-   /**
+    /**
      * The Vendor for the executable. Supports MONO and MICROSOFT: the default value is <code>MICROSOFT</code>. Not
      * case or white-space sensitive.
      *
@@ -82,38 +83,59 @@
      */
     private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
-    public void execute() throws MojoExecutionException {
+    public void execute()
+        throws MojoExecutionException
+    {
 
-        if(!System.getProperty("os.name").contains("Windows")) return;
+        if ( !System.getProperty( "os.name" ).contains( "Windows" ) )
+        {
+            return;
+        }
 
-        if (System.getProperty("bootstrap") != null)
+        if ( System.getProperty( "bootstrap" ) != null )
+        {
             return;
+        }
 
-        String nmavenSettings = System.getProperty("user.home") + File.separator + ".m2" + File.separator
-                + "nmaven-settings.xml";
+        String nmavenSettings =
+            System.getProperty( "user.home" ) + File.separator + ".m2" + File.separator + "nmaven-settings.xml";
 
-        if (new File(nmavenSettings).exists())
+        if ( new File( nmavenSettings ).exists() )
+        {
             return;
+        }
 
-        try {
+        try
+        {
             nmavenRegistry.createRepositoryRegistry();
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-aaa-003: Failed to create the repository registry for this plugin", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-aaa-003: Failed to create the repository registry for this plugin", e );
         }
 
         List<String> commands = new ArrayList<String>();
-        commands.add(new File(nmavenSettings).getAbsolutePath());
-        try {
+        commands.add( new File( nmavenSettings ).getAbsolutePath() );
+        try
+        {
             VendorInfo vendorInfo = VendorInfo.Factory.createDefaultVendorInfo();
-            if(vendor != null) vendorInfo.setVendor(VendorFactory.createVendorFromName(vendor));
-            vendorInfo.setFrameworkVersion(frameworkVersion);
-            vendorInfo.setVendorVersion(vendorVersion);
-            netExecutableFactory.getNetExecutableFromRepository("NMaven.Utility.Settings", "SettingsGenerator",
-                    vendorInfo, project, localRepository, commands).execute();
-        } catch (PlatformUnsupportedException e) {
-            throw new MojoExecutionException("", e);
-        } catch(ExecutionException e) {
-            throw new MojoExecutionException("", e);
+            if ( vendor != null )
+            {
+                vendorInfo.setVendor( VendorFactory.createVendorFromName( vendor ) );
+            }
+            vendorInfo.setFrameworkVersion( frameworkVersion );
+            vendorInfo.setVendorVersion( vendorVersion );
+            netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Settings", vendorInfo,
+                                                                 project, localRepository, commands ).execute();
+        }
+        catch ( PlatformUnsupportedException e )
+        {
+            throw new MojoExecutionException( "", e );
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "", e );
         }
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Wed Mar 21 12:50:36 2007
@@ -42,7 +42,9 @@
  * @goal test
  * @phase test
  */
-public class TesterMojo extends AbstractMojo {
+public class TesterMojo
+    extends AbstractMojo
+{
 
     /**
      * The maven project.
@@ -90,94 +92,128 @@
     private String testAssemblyPath;
 
 
-    public String getExecutableFor(Vendor vendor, String home) {
-        return !(nunitHome == null || nunitHome.equals("")) ? nunitHome + File.separator + "bin"
-                + File.separator + "nunit-console" : "nunit-console";
+    public String getExecutableFor( Vendor vendor, String home )
+    {
+        return !( nunitHome == null || nunitHome.equals( "" ) ) ? nunitHome + File.separator + "bin" + File.separator +
+            "nunit-console" : "nunit-console";
     }
 
-    public List<String> getCommandsFor(Vendor vendor) throws MojoExecutionException {
+    public List<String> getCommandsFor( Vendor vendor )
+        throws MojoExecutionException
+    {
         String finalName = project.getBuild().getFinalName();
         List<String> commands = new ArrayList<String>();
-        commands.add(testAssemblyPath + File.separator + project.getArtifactId() + "-test.dll");
-        commands.add("/xml:" + reportsDirectory + File.separator + "TEST-" + finalName + ".xml");
+        commands.add( testAssemblyPath + File.separator + project.getArtifactId() + "-test.dll" );
+        commands.add( "/xml:" + reportsDirectory + File.separator + "TEST-" + finalName + ".xml" );
 
-        commands.add("/output:" + reportsDirectory + File.separator + "TEST-" + finalName + "-RESULTS.txt");
-        commands.add("/err:" + reportsDirectory + File.separator + "TEST-" + finalName + "-ERROR.txt");
-        commands.add("/labels");
-
-        if (xmlConsole) commands.add("/xmlConsole");
+        commands.add( "/output:" + reportsDirectory + File.separator + "TEST-" + finalName + "-RESULTS.txt" );
+        commands.add( "/err:" + reportsDirectory + File.separator + "TEST-" + finalName + "-ERROR.txt" );
+        commands.add( "/labels" );
+
+        if ( xmlConsole )
+        {
+            commands.add( "/xmlConsole" );
+        }
         return commands;
     }
 
-    public void execute() throws MojoExecutionException {
-        String skipTests = System.getProperty("maven.test.skip");
-        if ((skipTests != null && skipTests.equalsIgnoreCase("true")) || skipTest) {
-            getLog().warn("NMAVEN-1100-000: Unit tests have been disabled.");
+    public void execute()
+        throws MojoExecutionException
+    {
+        String skipTests = System.getProperty( "maven.test.skip" );
+        if ( ( skipTests != null && skipTests.equalsIgnoreCase( "true" ) ) || skipTest )
+        {
+            getLog().warn( "NMAVEN-1100-000: Unit tests have been disabled." );
             return;
         }
-        String testFileName = project.getBuild().getDirectory() + File.separator
-                + project.getArtifactId() + "-test.dll";
+        String testFileName =
+            project.getBuild().getDirectory() + File.separator + project.getArtifactId() + "-test.dll";
 
-        if (!(new File(testFileName).exists())) {
-            getLog().info("NMAVEN-1100-001: No Unit Tests");
+        if ( !( new File( testFileName ).exists() ) )
+        {
+            getLog().info( "NMAVEN-1100-001: No Unit Tests" );
             return;
         }
 
         List<Artifact> nunitLibs = new ArrayList<Artifact>();
         Set<Artifact> artifacts = project.getDependencyArtifacts();
-        for (Artifact artifact : artifacts) {
-            if (artifact.getGroupId().equals("org.nunit")) {
-                nunitLibs.add(artifact);
-            } else {
-                try {
-                    FileUtils.copyFileToDirectory(artifact.getFile(), new File(testAssemblyPath));
-                } catch (IOException e) {
-                    throw new MojoExecutionException("NMAVEN-1100-002", e);
+        for ( Artifact artifact : artifacts )
+        {
+            if ( artifact.getGroupId().equals( "NUnit" ) )
+            {
+                nunitLibs.add( artifact );
+            }
+            else
+            {
+                try
+                {
+                    FileUtils.copyFileToDirectory( artifact.getFile(), new File( testAssemblyPath ) );
+                }
+                catch ( IOException e )
+                {
+                    throw new MojoExecutionException( "NMAVEN-1100-002", e );
                 }
             }
         }
 
-        if (nunitLibs.size() == 0)
-            throw new MojoExecutionException("NMAVEN-1100-003: Could not find any nunit libraries.");
+        if ( nunitLibs.size() == 0 )
+        {
+            throw new MojoExecutionException( "NMAVEN-1100-003: Could not find any nunit libraries." );
+        }
 
         //Copy Main Artifact
-        try {
-            if (project.getArtifact() != null && project.getArtifact().getFile() != null
-                    && project.getArtifact().getFile().exists()) {
-                FileUtils.copyFileToDirectory(project.getArtifact().getFile(), new File(testAssemblyPath));
+        try
+        {
+            if ( project.getArtifact() != null && project.getArtifact().getFile() != null &&
+                project.getArtifact().getFile().exists() )
+            {
+                FileUtils.copyFileToDirectory( project.getArtifact().getFile(), new File( testAssemblyPath ) );
             }
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1100-004: Unable to copy library to target directory: ", e);
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1100-004: Unable to copy library to target directory: ", e );
         }
 
         //Copy Test Artifact
-        try {
-            FileUtils.copyFileToDirectory(new File(testFileName), new File(testAssemblyPath));
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1100-005: Unable to copy library to target directory: ", e);
+        try
+        {
+            FileUtils.copyFileToDirectory( new File( testFileName ), new File( testAssemblyPath ) );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1100-005: Unable to copy library to target directory: ", e );
         }
 
         //Copy  NUnit Dependencies
-        for (Artifact artifact : nunitLibs) {
-            File file = new File(testAssemblyPath + File.separator + artifact.getArtifactId() + ".dll");
-            try {
-                FileUtils.copyFile(artifact.getFile(), file);
-            } catch (IOException e) {
-                throw new MojoExecutionException("NMAVEN-1100-006: Unable to copy nunit library to target directory: File = " +
-                        file.getAbsolutePath(), e);
+        for ( Artifact artifact : nunitLibs )
+        {
+            File file = new File( testAssemblyPath + File.separator + artifact.getArtifactId() + ".dll" );
+            try
+            {
+                FileUtils.copyFile( artifact.getFile(), file );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoExecutionException(
+                    "NMAVEN-1100-006: Unable to copy nunit library to target directory: File = " +
+                        file.getAbsolutePath(), e );
             }
         }
 
-        FileUtils.mkdir(reportsDirectory);
+        FileUtils.mkdir( reportsDirectory );
 
-        List<String> commands = getCommandsFor(null);
-        getLog().debug("NMAVEN-1100-008: " + commands.toString());
+        List<String> commands = getCommandsFor( null );
+        getLog().debug( "NMAVEN-1100-008: " + commands.toString() );
         CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
         //commandExecutor.setLog(getLog());
-        try {
-            commandExecutor.executeCommand(getExecutableFor(null, null), commands);
-        } catch (ExecutionException e) {
-            throw new MojoExecutionException("NMAVEN-1100-007", e);
+        try
+        {
+            commandExecutor.executeCommand( getExecutableFor( null, null ), commands );
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1100-007", e );
         }
     }
 }

Propchange: incubator/nmaven/trunk/plugins/maven-vstudio-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 21 12:50:36 2007
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Modified: incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,31 +1,32 @@
-<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>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <version>0.14-SNAPSHOT</version>
-        <artifactId>maven-dotnet-plugins</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<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>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-webapp-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>maven-webapp-plugin</name>
-    <description>
-        Maven Plugin for .NET
-    </description>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-webapp-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-webapp-plugin</name>
+  <description>
+    Maven Plugin for .NET
+  </description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-archiver</artifactId>
-            <version>1.0-alpha-3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.0</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-archiver</artifactId>
+      <version>1.0-alpha-3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>

Modified: incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java Wed Mar 21 12:50:36 2007
@@ -39,7 +39,9 @@
  * @goal package
  * @phase package
  */
-public class NetAchiverMojo extends AbstractMojo {
+public class NetAchiverMojo
+    extends AbstractMojo
+{
 
     /**
      * The maven project.
@@ -80,52 +82,69 @@
 
     private List excludes;
 
-    public void execute() throws MojoExecutionException {
+    public void execute()
+        throws MojoExecutionException
+    {
         String outputDirectory = project.getBuild().getDirectory() + File.separator + project.getArtifactId();
         String sourceDirectory = project.getBasedir() + "/src/main/webapp";
         DirectoryScanner directoryScanner = new DirectoryScanner();
-        directoryScanner.setBasedir(sourceDirectory);
+        directoryScanner.setBasedir( sourceDirectory );
         directoryScanner.addDefaultExcludes();
         directoryScanner.scan();
         String[] files = directoryScanner.getIncludedFiles();
-        for (String file : files) {
-            try {
-                FileUtils.copyFile(new File(sourceDirectory + File.separator + file),
-                        new File(outputDirectory + File.separator + file));
-            } catch (IOException e) {
-                throw new MojoExecutionException("NMAVEN-1200-000: Unable to process sources", e);
+        for ( String file : files )
+        {
+            try
+            {
+                FileUtils.copyFile( new File( sourceDirectory + File.separator + file ),
+                                    new File( outputDirectory + File.separator + file ) );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1200-000: Unable to process sources", e );
             }
         }
 
         Set<Artifact> artifacts = project.getDependencyArtifacts();
         Set<Artifact> dependencies = new HashSet<Artifact>();
-        dependencies.add(project.getArtifact());
-        for (Artifact artifact : artifacts) {
-            if ((artifact.getType().equals("library") || artifact.getType().equals("module")) &&
-                    artifact.getScope().equals(Artifact.SCOPE_COMPILE) || artifact.getScope().equals(Artifact.SCOPE_RUNTIME))
+        dependencies.add( project.getArtifact() );
+        for ( Artifact artifact : artifacts )
+        {
+            if ( ( artifact.getType().equals( "library" ) || artifact.getType().equals( "module" ) ) &&
+                artifact.getScope().equals( Artifact.SCOPE_COMPILE ) ||
+                artifact.getScope().equals( Artifact.SCOPE_RUNTIME ) )
             {
-                dependencies.add(artifact);
+                dependencies.add( artifact );
             }
         }
 
-        for (Artifact artifact : dependencies) {
-            try {
-                FileUtils.copyFileToDirectory(artifact.getFile(), new File(outputDirectory + "/bin"));
-            } catch (IOException e) {
-                throw new MojoExecutionException("NMAVEN-1200-001", e);
+        for ( Artifact artifact : dependencies )
+        {
+            try
+            {
+                FileUtils.copyFileToDirectory( artifact.getFile(), new File( outputDirectory + "/bin" ) );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1200-001", e );
             }
         }
 
         ZipArchiver zipArchiver = new ZipArchiver();
-        zipArchiver.setDestFile(new File(outputDirectory + ".nar"));
-        try {
-            zipArchiver.addDirectory(new File(outputDirectory));
+        zipArchiver.setDestFile( new File( outputDirectory + ".nar" ) );
+        try
+        {
+            zipArchiver.addDirectory( new File( outputDirectory ) );
             zipArchiver.createArchive();
-            getLog().info("NMAVEN-1200-004: Created .NET Archive: File = " + outputDirectory + ".nar");
-        } catch (ArchiverException e) {
-            throw new MojoExecutionException("NMAVEN-1200-002: Unable to create .NET archive:", e);
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1200-003: Unable to create .NET archive", e);
+            getLog().info( "NMAVEN-1200-004: Created .NET Archive: File = " + outputDirectory + ".nar" );
+        }
+        catch ( ArchiverException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1200-002: Unable to create .NET archive:", e );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1200-003: Unable to create .NET archive", e );
         }
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetArchiveDeployerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetArchiveDeployerMojo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetArchiveDeployerMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetArchiveDeployerMojo.java Wed Mar 21 12:50:36 2007
@@ -34,7 +34,9 @@
  * @goal deploy
  * @phase deploy
  */
-public class NetArchiveDeployerMojo extends AbstractMojo {
+public class NetArchiveDeployerMojo
+    extends AbstractMojo
+{
 
     /**
      * The maven project.
@@ -53,17 +55,22 @@
      */
     private String deployPath;
 
-    public void execute() throws MojoExecutionException {
+    public void execute()
+        throws MojoExecutionException
+    {
         String outputDirectory = project.getBuild().getDirectory() + File.separator + project.getArtifactId();
         String deployArtifact = deployPath + File.separator + project.getArtifactId();
-        try {
-            FileUtils.copyDirectoryStructure(new File(outputDirectory),
-                    new File(deployArtifact));
-            getLog().info("NMAVEN-1201-001: Copied .NET Web Application to deployment directory: " +
-                    "From = " + outputDirectory + ", To = " + deployArtifact);
-        } catch (IOException e) {
-            throw new MojoExecutionException("NMAVEN-1201-000: Failed to copy .NET Web Application to deployment directory: " +
-                    "From = " + outputDirectory + ", To = " + deployArtifact, e);
+        try
+        {
+            FileUtils.copyDirectoryStructure( new File( outputDirectory ), new File( deployArtifact ) );
+            getLog().info( "NMAVEN-1201-001: Copied .NET Web Application to deployment directory: " + "From = " +
+                outputDirectory + ", To = " + deployArtifact );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException(
+                "NMAVEN-1201-000: Failed to copy .NET Web Application to deployment directory: " + "From = " +
+                    outputDirectory + ", To = " + deployArtifact, e );
         }
     }
 }

Modified: incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,27 +1,28 @@
-<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>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <version>0.14-SNAPSHOT</version>
-        <artifactId>maven-dotnet-plugins</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<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>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-wsdl-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>maven-wsdl-plugin</name>
-    <description>
-        Maven Plugin for .NET
-    </description>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-wsdl-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-wsdl-plugin</name>
+  <description>
+    Maven Plugin for .NET
+  </description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-plugin-testing-harness</artifactId>
-            <version>1.0-beta-1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>1.0-beta-1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>



Mime
View raw message