incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r532117 - in /incubator/nmaven/branches/SI_XPT: assemblies/NMaven.Plugin.Solution/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ co...
Date Tue, 24 Apr 2007 22:33:38 GMT
Author: sisbell
Date: Tue Apr 24 15:33:35 2007
New Revision: 532117

URL: http://svn.apache.org/viewvc?view=rev&rev=532117
Log:
A working solution generator with new plugin architecture.

Modified:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Solution/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/ArtifactInstaller.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/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/ArtifactMetadataImpl.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-artifact/src/main/resources/META-INF/nmaven/artifact-registry.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Solution/pom.xml Tue Apr 24
15:33:35 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">
   <parent>
     <groupId>NMaven</groupId>
@@ -7,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.Plugin</groupId>
   <artifactId>NMaven.Plugin.Solution</artifactId>
-  <packaging>exe</packaging>
+  <packaging>netplugin</packaging>
   <version>0.14</version>
   <name>NMaven.Plugin.Solution</name>
   <dependencies>
@@ -26,6 +44,12 @@
     <dependency>
       <groupId>NMaven.Model</groupId>
       <artifactId>NMaven.Model.Pom</artifactId>
+      <type>library</type>
+      <version>0.14</version>
+    </dependency>
+    <dependency>
+      <groupId>NMaven.Plugin</groupId>
+      <artifactId>NMaven.Plugin</artifactId>
       <type>library</type>
       <version>0.14</version>
     </dependency>

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -87,7 +87,7 @@
      * @return the artifact for the specified ID.
      */
     Artifact getArtifactByID( String id );
-    
+
     /**
      * Returns an artifact installer used for installing NMaven artifacts into the local
Maven repository.
      *

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
Tue Apr 24 15:33:35 2007
@@ -60,11 +60,11 @@
      * Installs a non-maven artifact into the local maven repository so that the artifact
can be used within
      * a Maven build process.
      *
-     * @param groupId    the group id of the artifact to install
-     * @param artifactId the artifact id of the artifact to install
-     * @param version    the version of the artifact to install
-     * @param packaging  the packaging type of the artifact to install
-     * @param artifactFile    the artifact to install
+     * @param groupId      the group id of the artifact to install
+     * @param artifactId   the artifact id of the artifact to install
+     * @param version      the version of the artifact to install
+     * @param packaging    the packaging type of the artifact to install
+     * @param artifactFile the artifact to install
      * @throws ArtifactInstallationException if there is a problem installing the artifact
      */
     void installFile( String groupId, String artifactId, String version, String packaging,
File artifactFile )
@@ -84,9 +84,9 @@
         throws ArtifactInstallationException;
 
     /**
-     * Installs the dependent libraries (or assemblies) of the specified artifact. 
+     * Installs the dependent libraries (or assemblies) of the specified artifact.
      *
-     * @param artifact the artifact associated with the specified dependencies
+     * @param artifact     the artifact associated with the specified dependencies
      * @param dependencies a list of dependencies of the specified artifact
      * @throws ArtifactInstallationException if there is a problem installing the artifact
      */

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -28,7 +28,7 @@
     MODULE( "module", "module", "netmodule" ),
     LIBRARY( "library", "library", "dll" ),
     EXE( "exe", "exe", "exe" ),
-    WINEXE( "winexe",  "winexe", "exe" ),
+    WINEXE( "winexe", "winexe", "exe" ),
     NAR( "nar", "null", "nar" ),
     EXECONFIG( "exe.config", "null", "exe.config" ),
     NETPLUGIN( "netplugin", "library", "dll" ),
@@ -95,7 +95,7 @@
      * @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
)
+    public static synchronized ArtifactType getArtifactTypeForPackagingName( String packagingName
)
     {
         if ( packagingName.equals( ArtifactType.MODULE.getPackagingType() ) )
         {
@@ -115,19 +115,19 @@
         }
         else if ( packagingName.equals( ArtifactType.NAR.getPackagingType() ) )
         {
-           return ArtifactType.LIBRARY;
+            return ArtifactType.LIBRARY;
         }
         else if ( packagingName.equals( ArtifactType.NAR.getPackagingType() ) )
         {
-           return ArtifactType.NAR;
+            return ArtifactType.NAR;
         }
         else if ( packagingName.equals( ArtifactType.EXECONFIG.getPackagingType() ) )
         {
-           return ArtifactType.EXECONFIG;
+            return ArtifactType.EXECONFIG;
         }
         else if ( packagingName.equals( ArtifactType.NETPLUGIN.getPackagingType() ) )
         {
-           return ArtifactType.NETPLUGIN;
+            return ArtifactType.NETPLUGIN;
         }
         return ArtifactType.NULL;
     }

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -111,7 +111,7 @@
      */
     public File getLocalRepository()
     {
-        return new File(localRepository);
+        return new File( localRepository );
     }
 
     /**
@@ -131,9 +131,9 @@
         repository.init( artifactFactory );
         List<Artifact> artifacts = repository.getArtifactsFor( groupId, artifactId,
version, type );
         AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
-        for(Artifact artifact : artifacts)
+        for ( Artifact artifact : artifacts )
         {
-            artifact.setFile(new File( localRepository + File.separator + layout.pathOf(
artifact ) ) );
+            artifact.setFile( new File( localRepository + File.separator + layout.pathOf(
artifact ) ) );
         }
         return artifacts;
     }
@@ -202,7 +202,10 @@
                                                                          dependency.getVersion()
),
                                                                      dependency.getType(),
dependency.getClassifier(),
                                                                      scope, null );
-            if(!art.getType().startsWith( "gac")) depSet.add( art );
+            if ( !art.getType().startsWith( "gac" ) )
+            {
+                depSet.add( art );
+            }
         }
 
         try
@@ -271,7 +274,7 @@
     /**
      * Returns true if the artifact matches <i>all</i> match policies, otherwise
returns false.
      *
-     * @param artifact the artifact to match against the match policies
+     * @param artifact      the artifact to match against the match policies
      * @param matchPolicies the match policies
      * @return true if the artifact matches <i>all</i> match policies, otherwise
returns false
      */

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -283,7 +283,7 @@
 
         for ( Dependency dependency : dependencies )
         {
-            if(! (dependency.getType().equals( "library") || dependency.getType().equals(
"netplugin")))
+            if ( ! ( dependency.getType().equals( "library" ) || dependency.getType().equals(
"netplugin" ) ) )
             {
                 continue;
             }
@@ -297,8 +297,7 @@
             depPath.append( dependency.getArtifactId() ).append( File.separator )
                 .append( dependency.getVersion() ).append( File.separator );
             String extension = ArtifactType.getArtifactTypeForPackagingName( dependency.getType()
).getExtension();
-            File file =
-                new File( depPath.toString() + dependency.getArtifactId() + "." + extension
);
+            File file = new File( depPath.toString() + dependency.getArtifactId() + "." +
extension );
 
             try
             {

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactMetadataImpl.java
Tue Apr 24 15:33:35 2007
@@ -45,10 +45,10 @@
     }
 
     /**
-     *  Constructor. This method is intended to by invoked by the plexus-container, not by
the application developer.
+     * Constructor. This method is intended to by invoked by the plexus-container, not by
the application developer.
      *
-     * @param artifact  the artifact associated with the artifact metadata
-     * @param file      the pom file of the artifact
+     * @param artifact the artifact associated with the artifact metadata
+     * @param file     the pom file of the artifact
      */
     public ArtifactMetadataImpl( Artifact artifact, File file )
     {
@@ -59,13 +59,13 @@
      * Returns the file name of the pom located on a remote repository. Unlike its parent
class method, the pom
      * file name does not include version info.
      *
-     * @return  the file name of the pom located on a remote repository
+     * @return the file name of the pom located on a remote repository
      * @see org.apache.maven.project.artifact.ProjectArtifactMetadata#getRemoteFilename()
      */
     public String getRemoteFilename()
     {
-        //return super.getRemoteFilename();
-        return getArtifactId() + ".pom";
+        return super.getRemoteFilename();
+        //return getArtifactId() + ".pom";
     }
 
     /**
@@ -78,8 +78,8 @@
      */
     public String getLocalFilename( ArtifactRepository repository )
     {
-        //return super.getLocalFilename(repository);
-        return getArtifactId() + ".pom";
+        return super.getLocalFilename(repository);
+        //return getArtifactId() + ".pom";
     }
 
 

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -187,7 +187,7 @@
     }
 
     /**
-     * Returns the artifact associated with the specified id. 
+     * Returns the artifact associated with the specified id.
      *
      * @param id the artifact ID
      * @return the artifact associated with the specified id

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -1,30 +1,31 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
-<!--
+    <!--
 
-  @(#)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
-
-     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.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
+
+         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.
+
+    -->
 </head>
+
 <body bgcolor="white">
-    Provides the implementation classes of the <i>org.apache.maven.dotnet.artifact</i>
package.
+Provides the implementation classes of the <i>org.apache.maven.dotnet.artifact</i>
package.
 </body>
 </html>

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=532117&r1=532116&r2=532117
==============================================================================
--- 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
Tue Apr 24 15:33:35 2007
@@ -1,32 +1,33 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
-<!--
+    <!--
 
-  @(#)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
-
-     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.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
+
+         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.
+
+    -->
 </head>
+
 <body bgcolor="white">
-    Provides interfaces and classes for resolving and installing artifacts. The core interface
of this package is
-    <code>ArtifactContext</code>, which provides the methods for handling artifacts
and for providing a properly constructed
+Provides interfaces and classes for resolving and installing artifacts. The core interface
of this package is
+<code>ArtifactContext</code>, which provides the methods for handling artifacts
and for providing a properly constructed
 installer.
 </body>
 </html>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/nmaven/artifact-registry.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/nmaven/artifact-registry.xml?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/nmaven/artifact-registry.xml
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/nmaven/artifact-registry.xml
Tue Apr 24 15:33:35 2007
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 
 <registry-config>
-   <repositories>
-      <repository>
-         <repository-name>net-dependencies</repository-name>
-         <repository-class>org.apache.maven.dotnet.artifact.impl.NetDependenciesRepositoryImpl</repository-class>
-         <repository-config>/META-INF/nmaven/net-dependencies.xml</repository-config>
-      </repository>
-    </repositories>
+  <repositories>
+    <repository>
+      <repository-name>net-dependencies</repository-name>
+      <repository-class>org.apache.maven.dotnet.artifact.impl.NetDependenciesRepositoryImpl</repository-class>
+      <repository-config>/META-INF/nmaven/net-dependencies.xml</repository-config>
+    </repository>
+  </repositories>
 </registry-config>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
Tue Apr 24 15:33:35 2007
@@ -1,64 +1,64 @@
 <component-set>
-    <components>
-        <component>
-            <role>org.apache.maven.dotnet.artifact.ArtifactContext</role>
-            <implementation>org.apache.maven.dotnet.artifact.impl.ArtifactContextImpl</implementation>
-            <requirements>
-                <requirement>
-                    <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.dotnet.artifact.ArtifactInstaller</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-                    <role-hint>net</role-hint>
-                </requirement>
-            </requirements>
-        </component>
-        <component>
-            <role>org.apache.maven.dotnet.artifact.ArtifactInstaller</role>
-            <implementation>org.apache.maven.dotnet.artifact.impl.ArtifactInstallerImpl</implementation>
-            <requirements>
-                <requirement>
-                    <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
-                </requirement>
-            </requirements>
-        </component>
-        <component>
-            <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-            <implementation>org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout</implementation>
-            <role-hint>net</role-hint>
-        </component>
-        <component>
-            <role>org.apache.maven.dotnet.artifact.AssemblyResolver</role>
-            <implementation>org.apache.maven.dotnet.artifact.impl.AssemblyResolverImpl</implementation>
-            <requirements>
-                <requirement>
-                    <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-                </requirement>
-                <requirement>
-                    <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-                </requirement>
-            </requirements>
-        </component>
-    </components>
+  <components>
+    <component>
+      <role>org.apache.maven.dotnet.artifact.ArtifactContext</role>
+      <implementation>org.apache.maven.dotnet.artifact.impl.ArtifactContextImpl</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.dotnet.artifact.ArtifactInstaller</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+          <role-hint>net</role-hint>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.dotnet.artifact.ArtifactInstaller</role>
+      <implementation>org.apache.maven.dotnet.artifact.impl.ArtifactInstallerImpl</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+      <implementation>org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout</implementation>
+      <role-hint>net</role-hint>
+    </component>
+    <component>
+      <role>org.apache.maven.dotnet.artifact.AssemblyResolver</role>
+      <implementation>org.apache.maven.dotnet.artifact.impl.AssemblyResolverImpl</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
 </component-set>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
Tue Apr 24 15:33:35 2007
@@ -191,12 +191,12 @@
                 "NMAVEN-066-021: Could not locate the plugin: GroupId = " + groupId + ",
ArtifactId = " + artifactId );
         }
 
-      //  AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
-        //File artifactPath = new File( localRepository + File.separator + layout.pathOf(
artifact ) );
+        AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
+        File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact
) );
         List<String> commands = new ArrayList<String>();
         //commands.add( "mojoName=NMaven.Plugin.Solution" );
         commands.add( "parameterFile=" + parameterFile.getAbsolutePath() );
-        commands.add( "assemblyFile=" + artifact.getFile().getAbsolutePath() );
+        commands.add( "assemblyFile=" + artifactPath.getAbsolutePath() );
         commands.add( "mojoName=" + artifactId + "." + mojoName );//ArtifactId = namespace
         return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo,
project,
                                                localRepository, commands );
@@ -349,7 +349,7 @@
             : executableConfig.getExecutionPaths();
         if ( netHome != null && netHome.exists() )
         {
-            logger.info( "NMAVEN-066-014: Found executable path: Path = " + netHome.getAbsolutePath()
);
+            logger.info( "NMAVEN-066-014: Found executable path from pom: Path = " + netHome.getAbsolutePath()
);
             executablePaths.add( netHome.getAbsolutePath() );
         }
         else if ( vendorInfo.getExecutablePaths() != null )
@@ -358,7 +358,7 @@
             {
                 if ( path.exists() )
                 {
-                    logger.info( "NMAVEN-066-015: Found executable path: Path = " + path.getAbsolutePath()
);
+                    logger.debug( "NMAVEN-066-015: Found executable path: Path = " + path.getAbsolutePath()
);
                     executablePaths.add( path.getAbsolutePath() );
                 }
             }

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
Tue Apr 24 15:33:35 2007
@@ -187,7 +187,6 @@
         List<Dependency> gacInstallDependencies = repository.getDependenciesFor( gacInstallPolicies
);
         for ( Dependency dependency : gacInstallDependencies )
         {
-            System.out.println( dependency.getArtifactId() );
             List<Artifact> artifacts = artifactContext.getArtifactsFor( dependency.getGroupId(),
                                                                         dependency.getArtifactId(),
                                                                         dependency.getVersion(),
dependency.getType() );
@@ -196,10 +195,12 @@
                 NetExecutable netExecutable = netExecutableFactory.getNetExecutableFor( vendor,
frameworkVersion,
                                                                                         "GACUTIL",
project,
                                                                                         getGacInstallCommandsFor(
-                                                                                        
   artifacts.get( 0) ), null );
+                                                                                        
   artifacts.get( 0 ) ),
+                                                                                        null
);
                 netExecutable.execute();
                 getLog().info( "NMAVEN-1600-004: Installed Assembly into GAC: Assembly =
" +
-                    project.getArtifact().getFile() + ",  Vendor = " + netExecutable.getVendor().getVendorName()
);
+                    artifacts.get( 0 ).getFile().getAbsolutePath() + ",  Vendor = " +
+                    netExecutable.getVendor().getVendorName() );
             }
             catch ( ExecutionException e )
             {
@@ -221,6 +222,7 @@
         throws MojoExecutionException
     {
         List<String> commands = new ArrayList<String>();
+        commands.add( "/nologo" );
         commands.add( "/i" );
         commands.add( artifact.getFile().getAbsolutePath() );
         return commands;

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java?view=diff&rev=532117&r1=532116&r2=532117
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java
Tue Apr 24 15:33:35 2007
@@ -76,8 +76,8 @@
     {
         Element root = document.createElement( "configuration" );
         document.appendChild( root );
-        Node n1 = document.createElement( "localRepository" );
-        n1.setTextContent( localRepository );
+        Node n1 = document.createElement( "pomFile" );
+        n1.setTextContent( project.getFile().getAbsolutePath() );
         root.appendChild( n1 );
         File mavenProjectFile = writeMavenProjectToTempFile(project);
         Node mavenProjectFileNode = document.createElement( "mavenProject");



Mime
View raw message