You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/05/02 06:49:23 UTC
svn commit: r534334 - in /incubator/nmaven/branches/SI_XPT:
assemblies/NMaven.VisualStudio.Addin/
components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/
components/dotnet-core/src/main/resources/META-INF/nmaven/ plugins/
plugins/NMa...
Author: sisbell
Date: Tue May 1 23:49:22 2007
New Revision: 534334
URL: http://svn.apache.org/viewvc?view=rev&rev=534334
Log:
Some work towards the Addin plugin for packaging and deploying of IDE addins.
Added:
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.sln
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.suo (with props)
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml (with props)
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml (with props)
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven.Plugin.Addin.csproj
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java (with props)
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml
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-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/pom.xml
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml?view=diff&rev=534334&r1=534333&r2=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml Tue May 1 23:49:22 2007
@@ -25,9 +25,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.Addin</artifactId>
- <packaging>library</packaging>
+ <packaging>addin</packaging>
<version>0.14</version>
- <name>NMaven.VisualStudio</name>
+ <name>NMaven.VisualStudio.Addin</name>
<dependencies>
<dependency>
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=534334&r1=534333&r2=534334
==============================================================================
--- 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 May 1 23:49:22 2007
@@ -32,6 +32,8 @@
NAR( "nar", "null", "nar" ),
EXECONFIG( "exe.config", "null", "exe.config" ),
NETPLUGIN( "netplugin", "library", "dll" ),
+ VISUAL_STUDIO_ADDIN( "visual-studio-addin", "library", "dll" ),
+ SHARP_DEVELOP_ADDIN( "sharp-develop-addin", "library", "dll" ),
NULL( "null", "null", "null" );
/**
@@ -128,6 +130,10 @@
else if ( packagingName.equals( ArtifactType.NETPLUGIN.getPackagingType() ) )
{
return ArtifactType.NETPLUGIN;
+ }
+ else if ( packagingName.equals( ArtifactType.ADDIN.getPackagingType() ) )
+ {
+ return ArtifactType.ADDIN;
}
return ArtifactType.NULL;
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml?view=diff&rev=534334&r1=534333&r2=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml Tue May 1 23:49:22 2007
@@ -18,6 +18,18 @@
<version>0.14</version>
<type>netplugin</type>
</netDependency>
+ <netDependency>
+ <groupId>NMaven.VisualStudio</groupId>
+ <artifactId>NMaven.VisualStudio.Addin</artifactId>
+ <version>0.14</version>
+ <type>addin</type>
+ </netDependency>
+ <netDependency>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Addin</artifactId>
+ <version>0.14</version>
+ <type>netplugin</type>
+ </netDependency>
<!--Plugin Framework-->
<netDependency>
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.sln?view=auto&rev=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.sln (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.sln Tue May 1 23:49:22 2007
@@ -0,0 +1,17 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin.Addin", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\plugins\NMaven.Plugin.Addin\src\main\csharp\NMaven.Plugin.Addin.csproj", "{5FA10492-FE2D-4716-8D0C-BA8AC8138C2A}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {5FA10492-FE2D-4716-8D0C-BA8AC8138C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5FA10492-FE2D-4716-8D0C-BA8AC8138C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.suo
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.suo?view=auto&rev=534334
==============================================================================
Binary file - no diff available.
Propchange: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.suo
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml?view=auto&rev=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml Tue May 1 23:49:22 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Addin.JavaBinding</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>NMaven.Plugin.Addin.JavaBinding</name>
+ <version>0.14</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-assembler</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-executable</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-artifact</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-plugin</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml?view=auto&rev=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml Tue May 1 23:49:22 2007
@@ -0,0 +1,51 @@
+<?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>
+ <version>0.14</version>
+ <artifactId>NMaven.Assemblies</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven.Plugin</groupId>
+ <artifactId>NMaven.Plugin.Addin</artifactId>
+ <packaging>netplugin</packaging>
+ <version>0.14</version>
+ <name>NMaven.Plugin.Addin</name>
+ <dependencies>
+ <dependency>
+ <groupId>NMaven.Artifact</groupId>
+ <artifactId>NMaven.Artifact</artifactId>
+ <version>0.14</version>
+ <type>library</type>
+ </dependency>
+ <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>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven.Plugin.Addin.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven.Plugin.Addin.csproj?view=auto&rev=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven.Plugin.Addin.csproj (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven.Plugin.Addin.csproj Tue May 1 23:49:22 2007
@@ -0,0 +1,33 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{5FA10492-FE2D-4716-8D0C-BA8AC8138C2A}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <RootNameSpace>NMaven.Plugin</RootNameSpace>
+ <AssemblyName>NMaven.Plugin.Addin</AssemblyName>
+ <BaseIntermediateOutputPath>..\..\..\target\obj\</BaseIntermediateOutputPath>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup>
+ <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="NMaven.Artifact, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Artifact\NMaven.Artifact\0.14\NMaven.Artifact.dll</HintPath>
+ </Reference>
+ <Reference Include="NMaven.Core">
+ <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Core\NMaven.Core\0.14\NMaven.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="NMaven.Model.Pom" />
+ <Reference Include="NMaven.Plugin" />
+ <Reference Include="NMaven.Plugin" />
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="NMaven\Plugin\Addin\AutomationExtensibilityMojo.cs" />
+ </ItemGroup>
+ <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs?view=auto&rev=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs Tue May 1 23:49:22 2007
@@ -0,0 +1,65 @@
+//
+// 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.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using System.Xml.Serialization;
+
+using NMaven.Plugin;
+using NMaven.Model;
+using NMaven.Artifact;
+
+namespace NMaven.Plugin.Addin
+{
+ /// <summary>
+ /// Description
+ /// </summary>
+ [ClassAttribute(Phase = "package", Goal = "package")]
+ public sealed class AutomationExtensibilityMojo : AbstractMojo
+ {
+ public AutomationExtensibilityMojo()
+ {
+ }
+
+ [FieldAttribute("repository", Expression = "${settings.localRepository}", Type = "java.lang.String")]
+ public String localRepository;
+
+ [FieldAttribute("mavenProject", Expression = "${project}", Type = "org.apache.maven.project.MavenProject")]
+ public NMaven.Model.Model mavenProject;
+
+
+ public override Type GetMojoImplementationType()
+ {
+ return this.GetType();
+ }
+
+ public override void Execute()
+ {
+ ArtifactRepositoryLayout layout = new ArtifactRepositoryLayout();
+ ArtifactContext artifactContext = new ArtifactContext();
+ NMaven.Artifact.Artifact artifact = artifactContext.GetArtifactFor(mavenProject);
+ Console.WriteLine("Artifact Id = " + artifact.ArtifactId);
+ Console.WriteLine("Path = " + layout.pathOf(artifact));
+ FileInfo artifactFileInfo = new FileInfo(localRepository + @"\" + layout.pathOf(artifact));
+ Console.WriteLine("Artifact Path = " + artifactFileInfo.FullName);
+ }
+ }
+}
Added: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java?view=auto&rev=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java Tue May 1 23:49:22 2007
@@ -0,0 +1,109 @@
+package NMaven.Plugin.Addin;
+
+import org.apache.maven.dotnet.plugin.FieldAnnotation;
+
+/**
+ * @phase package
+ * @goal package
+ */
+public class AutomationExtensibilityMojo
+ extends org.apache.maven.dotnet.plugin.AbstractMojo
+{
+ /**
+ * @parameter expression = "${settings.localRepository}"
+ */
+ @FieldAnnotation()
+ public java.lang.String repository;
+
+ /**
+ * @parameter expression = "${project}"
+ */
+ @FieldAnnotation()
+ public org.apache.maven.project.MavenProject mavenProject;
+
+ /**
+ * @parameter expression = "${project}"
+ */
+ private org.apache.maven.project.MavenProject project;
+
+ /**
+ * @parameter expression = "${settings.localRepository}"
+ */
+ private String localRepository;
+
+ /**
+ * @parameter expression = "${vendor}"
+ */
+ private String vendor;
+
+ /**
+ * @parameter expression = "${vendorVersion}"
+ */
+ private String vendorVersion;
+
+ /**
+ * @parameter expression = "${frameworkVersion}"
+ */
+ private String frameworkVersion;
+
+ /**
+ * @component
+ */
+ private org.apache.maven.dotnet.executable.NetExecutableFactory netExecutableFactory;
+
+ /**
+ * @component
+ */
+ private org.apache.maven.dotnet.plugin.PluginContext pluginContext;
+
+ public String getMojoArtifactId()
+ {
+ return "NMaven.Plugin.Addin";
+ }
+
+ public String getMojoGroupId()
+ {
+ return "NMaven.Plugin";
+ }
+
+ public String getClassName()
+ {
+ return "NMaven.Plugin.Addin.AutomationExtensibilityMojo";
+ }
+
+ public org.apache.maven.dotnet.plugin.PluginContext getNetPluginContext()
+ {
+ return pluginContext;
+ }
+
+ public org.apache.maven.dotnet.executable.NetExecutableFactory getNetExecutableFactory()
+ {
+ return netExecutableFactory;
+ }
+
+ public org.apache.maven.project.MavenProject getMavenProject()
+ {
+ return project;
+ }
+
+ public String getLocalRepository()
+ {
+ return localRepository;
+ }
+
+ public String getVendorVersion()
+ {
+ return vendorVersion;
+ }
+
+ public String getVendor()
+ {
+ return vendor;
+ }
+
+ public String getFrameworkVersion()
+ {
+ return frameworkVersion;
+ }
+
+}
Propchange: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=534334&r1=534333&r2=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Tue May 1 23:49:22 2007
@@ -198,6 +198,82 @@
</configuration>
</component>
<component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>visual-studio-addin</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,
+ NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding: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>sharp-develop-addin</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,
+ NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding: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>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=534334&r1=534333&r2=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Tue May 1 23:49:22 2007
@@ -92,7 +92,9 @@
//To allow executables to be runnable from the repo
if ( artifact.getType().equals( ArtifactType.EXE.getPackagingType() ) ||
- artifact.getType().equals( ArtifactType.NETPLUGIN.getPackagingType() ) )
+ artifact.getType().equals( ArtifactType.NETPLUGIN.getPackagingType() ) ||
+ artifact.getType().equals( ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) ||
+ artifact.getType().equals( ArtifactType.SHARP_DEVELOP_ADDIN.getPackagingType() ))
{
List<Dependency> dependencies = project.getDependencies();
try
@@ -106,24 +108,5 @@
}
long endTime = System.currentTimeMillis();
getLog().info( "Mojo Execution Time = " + ( endTime - startTime ) );
- //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/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=534334&r1=534333&r2=534334
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Tue May 1 23:49:22 2007
@@ -30,7 +30,6 @@
<module>maven-mojo-generator-plugin</module>
<module>maven-resgen-plugin</module>
<module>maven-resolver-plugin</module>
- <module>maven-settings-plugin</module>
<module>maven-test-plugin</module>
<module>maven-webapp-plugin</module>
<module>maven-xsd-plugin</module>