From nmaven-commits-return-354-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Sat May 26 01:57:47 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 68331 invoked from network); 26 May 2007 01:57:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 May 2007 01:57:46 -0000 Received: (qmail 9056 invoked by uid 500); 26 May 2007 01:57:51 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 9006 invoked by uid 500); 26 May 2007 01:57:51 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 8984 invoked by uid 99); 26 May 2007 01:57:51 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 18:57:51 -0700 X-ASF-Spam-Status: No, hits=-98.2 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_QUOTING X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 18:57:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0D4E81A9820; Fri, 25 May 2007 18:57:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r541842 [1/2] - in /incubator/nmaven/trunk: ./ assemblies/ assemblies/NMaven.Model/Pom/ components/dotnet-artifact/ components/dotnet-assembler/ components/dotnet-core/ components/dotnet-executable/ components/dotnet-executable/src/main/jav... Date: Sat, 26 May 2007 01:57:20 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070526015722.0D4E81A9820@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Fri May 25 18:57:16 2007 New Revision: 541842 URL: http://svn.apache.org/viewvc?view=rev&rev=541842 Log: Significatn cleanup of the builds and poms. Now all of the java plugins, components, and binding compile with a single mvn install. There is now also a single build for all of the .NET assemblies and plugins. Added: incubator/nmaven/trunk/plugins/netplugins/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/DevenvMojo.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/LICENSE.txt (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/MimeType.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/ResX.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/LICENSE.txt (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/main/java/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/main/java/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/main/java/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/main/java/NMaven/Plugin/Settings/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/src/main/java/NMaven/Plugin/Settings/SettingsGeneratorMojo.java (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/nmaven-settings.xsd (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/NMaven/Plugin/Settings/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/NMaven/Plugin/Settings/ExecutionException.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/NMaven/Plugin/Settings/SettingsGeneratorMojo.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/main/csharp/NMaven/Plugin/Settings/nmavenSettings.cs incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/site/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/src/site/site.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/LICENSE.txt (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml (with props) incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs incubator/nmaven/trunk/plugins/netplugins/pom.xml (with props) Removed: incubator/nmaven/trunk/plugins/NMaven.Plugin.Addin/ incubator/nmaven/trunk/plugins/NMaven.Plugin.Devenv/ incubator/nmaven/trunk/plugins/NMaven.Plugin.Resx/ incubator/nmaven/trunk/plugins/NMaven.Plugin.Settings/ incubator/nmaven/trunk/plugins/NMaven.Plugin.Solution/ incubator/nmaven/trunk/plugins/pom-netplugins.xml Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml incubator/nmaven/trunk/assemblies/pom.xml incubator/nmaven/trunk/bootstrap-build.bat incubator/nmaven/trunk/components/dotnet-artifact/pom.xml incubator/nmaven/trunk/components/dotnet-assembler/pom.xml incubator/nmaven/trunk/components/dotnet-core/pom.xml incubator/nmaven/trunk/components/dotnet-executable/pom.xml incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java incubator/nmaven/trunk/components/dotnet-jetty/pom.xml incubator/nmaven/trunk/components/dotnet-plugin/pom.xml incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml incubator/nmaven/trunk/components/dotnet-vendor/pom.xml incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceCopierMojo.java incubator/nmaven/trunk/plugins/pom.xml Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml (original) +++ incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml Fri May 25 18:57:16 2007 @@ -27,7 +27,6 @@ NMaven.Model NMaven.Model.Pom library - 0.14-SNAPSHOT NMaven.Model.Pom Modified: incubator/nmaven/trunk/assemblies/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/assemblies/pom.xml (original) +++ incubator/nmaven/trunk/assemblies/pom.xml Fri May 25 18:57:16 2007 @@ -18,120 +18,21 @@ --> + + NMaven.Project + 0.14-SNAPSHOT + NMaven.Project + ../pom-dotnet.xml + 4.0.0 NMaven NMaven.Assemblies pom - 0.14-SNAPSHOT NMaven.Assemblies http://incubator.apache.org/nmaven NMaven provides Maven 2.x plugins to support building of .NET applications - - - NMaven Dev List - nmaven-dev-subscribe@incubator.apache.org - nmaven-dev-unsubscribe@incubator.apache.org - nmaven-dev@incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-nmaven-dev/ - - http://www.nabble.com/nmaven-dev-f17655.html - - - - NMaven Commits List - nmaven-commits-subscribe@incubator.apache.org - nmaven-commits-unsubscribe@incubator.apache.org - nmaven-commits@incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-nmaven-commits/ - - http://www.nabble.com/nmaven-commits-f17656.html - - - - - https://svn.apache.org/repos/asf/incubator/nmaven/ - scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/ - - scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/ - REL_0_14_SNAPSHOT - - - NMaven - http://incubator.apache.org/nmaven - - - JIRA Bugtracking - http://jira.codehaus.org/browse/NMAVEN - - - - Apache 2.0 - LICENSE.txt - - - - - Brett Porter - brett - brett@apache.org - - champion - mentor - - - - Jason van Zyl - jvanzyl - jvanzyl@apache.org - - champion - mentor - - - - Shane Isbell - sisbell - sisbell@apache.org - http://jroller.com/page/random7 - - committer - - - - Dan Fabulich - dfabulich - dfabulich@apache.org - - committer - - - - Chris Stevenson - chrisjs - chrisjs@apache.org - - committer - - - - Trygve Laugstol - trygvis - trygvis@apache.org - - committer - - - - James Strachan - jstrachan - jstrachan@apache.org - - committer - - - NMaven.Artifact NMaven.Core @@ -145,20 +46,6 @@ NMaven.Plugin.Runner NMaven.Service/Embedder - - src/main/csharp - src/test/csharp - - - org.apache.maven.dotnet.plugins - maven-compile-plugin - true - - 2.0.50727 - - - - @@ -185,13 +72,4 @@ - - - true - snapshot repo - snapshot repo - file://${deploy.directory} - default - - Modified: incubator/nmaven/trunk/bootstrap-build.bat URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/bootstrap-build.bat?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/bootstrap-build.bat (original) +++ incubator/nmaven/trunk/bootstrap-build.bat Fri May 25 18:57:16 2007 @@ -5,19 +5,6 @@ call mvn %phase% IF errorlevel 1 GOTO END -ECHO Building JavaBindings for the .NET Plugins -call mvn -f ./plugins/NMaven.Plugin.Addin/pom-java.xml %phase% -IF errorlevel 1 GOTO END - -call mvn -f ./plugins/NMaven.Plugin.Devenv/pom-java.xml %phase% -IF errorlevel 1 GOTO END - -call mvn -f ./plugins/NMaven.Plugin.Settings/pom-java.xml %phase% -IF errorlevel 1 GOTO END - -call mvn -f ./plugins/NMaven.Plugin.Solution/pom-java.xml %phase% -IF errorlevel 1 GOTO END - ECHO Installing 3rd Party Assemblies in the Local Repo call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0 IF errorlevel 1 GOTO END Modified: incubator/nmaven/trunk/components/dotnet-artifact/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-artifact/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-artifact/pom.xml Fri May 25 18:57:16 2007 @@ -27,7 +27,7 @@ org.apache.maven.dotnet dotnet-artifact dotnet-artifact - + @@ -41,12 +41,12 @@ org.apache.maven.dotnet dotnet-model-netdependency - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-core - 0.14-SNAPSHOT + ${pom.version} Modified: incubator/nmaven/trunk/components/dotnet-assembler/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-assembler/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-assembler/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-assembler/pom.xml Fri May 25 18:57:16 2007 @@ -42,17 +42,17 @@ org.apache.maven.dotnet dotnet-model-assembly-plugins - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-artifact - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-core - 0.14-SNAPSHOT + ${pom.version} Modified: incubator/nmaven/trunk/components/dotnet-core/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-core/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-core/pom.xml Fri May 25 18:57:16 2007 @@ -34,7 +34,7 @@ org.apache.maven.dotnet dotnet-registry - 0.14-SNAPSHOT + ${pom.version} org.apache.maven Modified: incubator/nmaven/trunk/components/dotnet-executable/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-executable/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-executable/pom.xml Fri May 25 18:57:16 2007 @@ -34,27 +34,27 @@ org.apache.maven.dotnet dotnet-core - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-artifact - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-model-executable-plugins - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-model-compiler-plugins - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-vendor - 0.14-SNAPSHOT + ${pom.version} Modified: incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java (original) +++ incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java Fri May 25 18:57:16 2007 @@ -162,7 +162,6 @@ executeCommand( executable, commands, null, failsOnErrorOutput ); } - public void executeCommand( String executable, List commands, File workingDirectory, boolean failsOnErrorOutput ) throws ExecutionException Modified: incubator/nmaven/trunk/components/dotnet-jetty/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-jetty/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-jetty/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-jetty/pom.xml Fri May 25 18:57:16 2007 @@ -37,7 +37,7 @@ org.apache.maven.dotnet dotnet-artifact - 0.14-SNAPSHOT + ${pom.version} Modified: incubator/nmaven/trunk/components/dotnet-plugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-plugin/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-plugin/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-plugin/pom.xml Fri May 25 18:57:16 2007 @@ -42,17 +42,17 @@ org.apache.maven.dotnet dotnet-executable - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-vendor - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-model-configuration-appenders - 0.14-SNAPSHOT + ${pom.version} Modified: incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml Fri May 25 18:57:16 2007 @@ -39,7 +39,7 @@ org.apache.maven.dotnet dotnet-embedder - 0.14-SNAPSHOT + ${pom.version} Modified: incubator/nmaven/trunk/components/dotnet-vendor/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/pom.xml?view=diff&rev=541842&r1=541841&r2=541842 ============================================================================== --- incubator/nmaven/trunk/components/dotnet-vendor/pom.xml (original) +++ incubator/nmaven/trunk/components/dotnet-vendor/pom.xml Fri May 25 18:57:16 2007 @@ -34,37 +34,12 @@ org.apache.maven.dotnet dotnet-core - 0.14-SNAPSHOT + ${pom.version} org.apache.maven.dotnet dotnet-model-settings - 0.14-SNAPSHOT + ${pom.version} - - - - maven-javadoc-plugin - - true - - - - maven-assembly-plugin - - src/assembly/src.xml - src/target - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - 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=541842&r1=541841&r2=541842 ============================================================================== --- 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 Fri May 25 18:57:16 2007 @@ -29,8 +29,8 @@ /** * @goal install-file - * @phase install * @requiresProject false + * @requiresDirectInvocation true */ public class FileInstallerMojo @@ -75,7 +75,7 @@ private String artifactId; /** - * @parameter expression = "${version} + * @parameter expression = "${artifactVersion} * @required */ private String version; 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=541842&r1=541841&r2=541842 ============================================================================== --- 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 Fri May 25 18:57:16 2007 @@ -72,7 +72,7 @@ } try { - FileUtils.copyDirectory( new File( project.getBasedir() + File.separator + "src/main/config" ), + FileUtils.copyDirectory( new File( project.getBasedir(), "src/main/config" ), new File( project.getBuild().getDirectory() ), "*.exe.config", null ); } catch ( IOException e ) @@ -81,27 +81,27 @@ } } - private void copyResourceDirectory( String sourceDirectory, String outputDirectory, List includes, List excludes ) + 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 ) ); + directoryScanner.setIncludes( includes.toArray( new String[includes.size()] ) ); } if ( !excludes.isEmpty() ) { - directoryScanner.setExcludes( listAsStringArray( excludes ) ); + directoryScanner.setExcludes( excludes.toArray( new String[excludes.size()] ) ); } directoryScanner.addDefaultExcludes(); directoryScanner.scan(); String[] files = directoryScanner.getIncludedFiles(); for ( String file : files ) { - File sourceFile = new File( sourceDirectory + File.separator + file ); - File destinationFile = - new File( outputDirectory + File.separator + "assembly-resources" + File.separator + file ); + File sourceFile = new File( sourceDirectory, file ); + File destinationFile = new File( outputDirectory, "assembly-resources" + File.separator + file ); try { FileUtils.copyFile( sourceFile, destinationFile ); @@ -117,20 +117,5 @@ 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]; - } - String[] target = new String[list.size()]; - int j = 0; - for ( Iterator i = list.iterator(); i.hasNext(); j++ ) - { - target[j] = (String) i.next(); - } - return target; } } Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml Fri May 25 18:57:16 2007 @@ -0,0 +1,36 @@ + + + + org.apache.maven.dotnet.plugins + 0.14-SNAPSHOT + maven-dotnet-plugins + ../../../pom.xml + + 4.0.0 + NMaven.Plugins + NMaven.Plugin.Addin.JavaBinding + maven-plugin + NMaven.Plugin.Addin.JavaBinding + + + org.apache.maven.dotnet + dotnet-assembler + ${pom.version} + + + org.apache.maven.dotnet + dotnet-executable + ${pom.version} + + + org.apache.maven.dotnet + dotnet-artifact + ${pom.version} + + + org.apache.maven.dotnet + dotnet-plugin + ${pom.version} + + + \ No newline at end of file Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java Fri May 25 18:57:16 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.Plugins"; + } + + 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/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml Fri May 25 18:57:16 2007 @@ -0,0 +1,50 @@ + + + + NMaven.Plugins + 0.14-SNAPSHOT + NMaven.Plugins + + 4.0.0 + NMaven.Plugins + NMaven.Plugin.Addin + netplugin + NMaven.Plugin.Addin + + + NMaven.Artifact + NMaven.Artifact + ${pom.version} + library + + + NMaven.Model + NMaven.Model.AutomationExtensibility + library + ${pom.version} + + + NMaven.Plugin + NMaven.Plugin + library + ${pom.version} + + + \ No newline at end of file Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs Fri May 25 18:57:16 2007 @@ -0,0 +1,118 @@ +// +// 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 +{ + /// + /// Description + /// + [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 AssemblyRepositoryLayout(); + ArtifactContext artifactContext = new ArtifactContext(); + NMaven.Artifact.Artifact artifact = artifactContext.GetArtifactFor(mavenProject); + FileInfo artifactFileInfo = new FileInfo(localRepository + @"\" + layout.pathOf(artifact)); + Console.WriteLine("Artifact Path = " + artifactFileInfo.FullName); + + object[] extensibilityItems = new object[2]; + //Host Application + ExtensibilityHostApplication hostApplication = new ExtensibilityHostApplication(); + List itemsChoiceTypes = new List(); + List itemsChoiceTypeValues = new List(); + + itemsChoiceTypes.Add(ItemsChoiceType.Name); + itemsChoiceTypeValues.Add("Microsoft Visual Studio"); + + itemsChoiceTypes.Add(ItemsChoiceType.Version); + itemsChoiceTypeValues.Add("8.0"); + + hostApplication.Items = itemsChoiceTypeValues.ToArray(); + hostApplication.ItemsElementName = itemsChoiceTypes.ToArray(); + extensibilityItems[0] = hostApplication; + + //Addin + ExtensibilityAddin addin = new ExtensibilityAddin(); + List itemNames = new List(); + List itemValues = new List(); + + itemNames.Add(ItemsChoiceType1.Assembly); + itemValues.Add(artifactFileInfo.FullName); + + itemNames.Add(ItemsChoiceType1.FullClassName); + itemValues.Add(mavenProject.artifactId + ".Connect"); + + itemNames.Add(ItemsChoiceType1.FriendlyName); + itemValues.Add(mavenProject.name); + + itemNames.Add(ItemsChoiceType1.Description); + itemValues.Add(mavenProject.description); + + itemNames.Add(ItemsChoiceType1.LoadBehavior); + itemValues.Add("0"); + + itemNames.Add(ItemsChoiceType1.CommandLineSafe); + itemValues.Add("0"); + + itemNames.Add(ItemsChoiceType1.CommandPreload); + itemValues.Add("1"); + + addin.Items = itemValues.ToArray(); + addin.ItemsElementName = itemNames.ToArray(); + extensibilityItems[1] = addin; + + Extensibility extensibility = new Extensibility(); + extensibility.Items = extensibilityItems; + + //write XML + XmlSerializer serializer = new XmlSerializer(typeof(NMaven.Model.Extensibility)); + XmlTextWriter xmlWriter = new XmlTextWriter(@"c:\tmp\NMavenBuild.AddIn", System.Text.Encoding.Unicode); + xmlWriter.Formatting = Formatting.Indented; + serializer.Serialize(xmlWriter, extensibility); + } + } +} Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml Fri May 25 18:57:16 2007 @@ -0,0 +1,37 @@ + + + + org.apache.maven.dotnet.plugins + 0.14-SNAPSHOT + maven-dotnet-plugins + ../../../pom.xml + + 4.0.0 + NMaven.Plugins + NMaven.Plugin.Devenv.JavaBinding + maven-plugin + NMaven.Plugin.Devenv.JavaBinding + + + org.apache.maven.dotnet + dotnet-assembler + ${pom.version} + + + org.apache.maven.dotnet + dotnet-executable + ${pom.version} + + + org.apache.maven.dotnet + dotnet-artifact + ${pom.version} + + + org.apache.maven.dotnet + dotnet-plugin + ${pom.version} + + + \ No newline at end of file Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java Fri May 25 18:57:16 2007 @@ -0,0 +1,109 @@ +package NMaven.Plugin.Devenv; + +import org.apache.maven.dotnet.plugin.FieldAnnotation; + +/** + * @phase deploy + * @goal start + */ +public class DevenvMojo + extends org.apache.maven.dotnet.plugin.AbstractMojo +{ + /** + * @parameter expression = "${project.artifactId}" + */ + @FieldAnnotation() + public java.lang.String artifactId; + + /** + * @parameter expression = "${project.build.directory}" + */ + @FieldAnnotation() + public java.lang.String buildDirectory; + + /** + * @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.Devenv"; + } + + public String getMojoGroupId() + { + return "NMaven.Plugins"; + } + + public String getClassName() + { + return "NMaven.Plugin.Devenv.DevenvMojo"; + } + + 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/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml Fri May 25 18:57:16 2007 @@ -0,0 +1,38 @@ + + + + NMaven.Plugins + 0.14-SNAPSHOT + NMaven.Plugins + + 4.0.0 + NMaven.Plugins + NMaven.Plugin.Devenv + netplugin + NMaven.Plugin.Devenv + + + NMaven.Plugin + NMaven.Plugin + library + ${pom.version} + + + \ No newline at end of file Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/DevenvMojo.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/DevenvMojo.cs?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/DevenvMojo.cs (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/DevenvMojo.cs Fri May 25 18:57:16 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.Diagnostics; + +using Microsoft.Win32; + +using NMaven.Plugin; + +namespace NMaven.Plugin.Devenv +{ + /// + /// Description + /// + [Serializable] + [ClassAttribute(Phase = "deploy", Goal = "start")] + public sealed class DevenvMojo : AbstractMojo + { + public DevenvMojo() + { + } + + [FieldAttribute("artifactId", Expression = "${project.artifactId}", Type = "java.lang.String")] + public String artifactId; + + [FieldAttribute("buildDirectory", Expression = "${project.build.directory}", Type = "java.lang.String")] + public String buildDirectory; + + public override Type GetMojoImplementationType() + { + return this.GetType(); + } + + public override void Execute() + { + string args = "/ResetAddin " + artifactId + ".Connect " + "/Log " + @"""" + @buildDirectory + + @"\VisualStudio.log" + @""""; + RegistryKey visualStudioKey = + Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\VisualStudio\8.0"); + String installDir = (String) visualStudioKey.GetValue("InstallDir"); + ProcessStartInfo processStartInfo = + new ProcessStartInfo(@installDir + "devenv.exe", args); + Process.Start(processStartInfo); + } + } +} Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/LICENSE.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/LICENSE.txt?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/LICENSE.txt (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/LICENSE.txt Fri May 25 18:57:16 2007 @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml Fri May 25 18:57:16 2007 @@ -0,0 +1,30 @@ + + + + NMaven.Plugins + 0.14-SNAPSHOT + NMaven.Plugins + + 4.0.0 + NMaven.Plugins + NMaven.Plugin.Resx + exe + NMaven.Plugin.ResX + \ No newline at end of file Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config Fri May 25 18:57:16 2007 @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/MimeType.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/MimeType.cs?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/MimeType.cs (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/MimeType.cs Fri May 25 18:57:16 2007 @@ -0,0 +1,69 @@ +// +// 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; + +namespace NMaven.Plugin.ResX +{ + /// + /// Provides mime-type information + /// + internal class MimeType + { + private string subType; + + private string type; + + private string extension; + + /// + /// Constructor + /// + /// + /// + /// the extension of a file with the mime-type + + internal MimeType(string type, string subType, string extension) + { + this.type = type; + this.subType = subType; + this.extension = extension; + } + + internal string GetSubType() + { + return subType; + } + + internal string GetPrimaryType() + { + return type; + } + + internal string GetExtension() + { + return extension; + } + + public override string ToString() + { + return "SubType = " + subType + ", Type = " + type + ", Extension = " + extension; + } + } +} \ No newline at end of file Added: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/ResX.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/ResX.cs?view=auto&rev=541842 ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/ResX.cs (added) +++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/csharp/NMaven/Plugin/Resx/ResX.cs Fri May 25 18:57:16 2007 @@ -0,0 +1,177 @@ +// +// 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.Text; +using System.Resources; +using System.IO; +using System.Configuration; +using System.Drawing; + +namespace NMaven.Plugin.ResX +{ + /// + /// Utility for generating resource files + /// + public class ResourceGenerator + { + /// + /// Generates a resource file + /// + ///directory containing resources (jpg, txt, wav) + ///the generated .resources file + ///void + public void Execute(string sourceDirectory, string outputFile) + { + AppSettingsReader appSettingsReader = new AppSettingsReader(); + if (!hasConfig(appSettingsReader)) throw new Exception("NMAVEN-9000-003: Could not find exe.config file."); + + ResXResourceWriter resourceWriter = new ResXResourceWriter(@outputFile); + + DirectoryInfo directoryInfo = + new DirectoryInfo(@sourceDirectory); + foreach (FileInfo fileInfo in directoryInfo.GetFiles()) + { + MimeType mimeType = GetMimeTypeFor(fileInfo.Name, appSettingsReader); + string extension = mimeType.GetExtension(); + if (extension.Equals("ico")) + resourceWriter.AddResource(fileInfo.Name, new Icon(@fileInfo.FullName)); + else if (extension.Equals("x-properties")) + { + StreamReader reader = new StreamReader(fileInfo.OpenRead(),Encoding.Default); + while(reader.Peek() >= 0) + { + string[] values = reader.ReadLine().Split('='); + if(values != null && values.Length == 2 && !values[0].StartsWith("#")) + resourceWriter.AddResource(values[0], values[1]); + } + reader.Close(); + } + else if (extension.Equals("db")) + continue;//Thumbnail + else if(extension.Equals("wav")) + { + MemoryStream memoryStream = FileInfoToMemoryStream(fileInfo); + resourceWriter.AddResource(fileInfo.Name, memoryStream); + memoryStream.Close(); + } + else if (mimeType.GetPrimaryType().Equals("image")) + resourceWriter.AddResource(fileInfo.Name, new Bitmap(@fileInfo.FullName)); + else if(mimeType.GetPrimaryType().Equals("text")) + resourceWriter.AddResource(fileInfo.Name, fileInfo.OpenText().ReadToEnd()); + else + { + MemoryStream memoryStream = FileInfoToMemoryStream(fileInfo); + resourceWriter.AddResource(fileInfo.Name, memoryStream.ToArray()); + memoryStream.Close(); + } + } + resourceWriter.Generate(); + resourceWriter.Close(); + } + + /// + /// Entry method + /// + /// array of arguments: 1) source directory of resources and 2) resource output file + /// if successful, return 0, otherwise returns 1 + public static int Main(string[] args) + { + Console.WriteLine("NMAVEN Resource Generator Utility "); +/* + if (args.Length != 2) + { + StringBuilder stringBuilder = new StringBuilder(); + foreach (string arg in args) + stringBuilder.Append("Arg = ").Append(arg).Append(", "); + + Console.Error.WriteLine("NMAVEN-9000-000: Exiting program: Incorrect number of args (should have 2): Number Found = {0}, {1} ", + args.Length, stringBuilder.ToString()); + return 1; + } +*/ + string sourceDirectory = args[0]; + string outputFile = args[1]; + + ResourceGenerator resX = new ResourceGenerator(); + try + { + resX.Execute(sourceDirectory, outputFile); + } + catch (Exception e) + { + Console.Error.WriteLine("NMAVEN-9000-002: Unable to generate resources: " + e.ToString()); + return 1; + } + return 0; + } + + /// + /// Returns mime-type information for the given file + /// + /// file name + /// reader for the utility config + /// mime-type information for the given file + private MimeType GetMimeTypeFor(String fileName, AppSettingsReader appSettingsReader) + { + string extension = new FileInfo(fileName).Extension.Substring(1); + string mimeType = null; + try + { + mimeType = (string)appSettingsReader.GetValue(extension, typeof(string)); + } + catch (InvalidOperationException e) + { + Console.WriteLine("NMAVEN-9000-001: Could not find the mime-type: Extension = {0} " + , extension); + return new MimeType("", "", extension); + } + return new MimeType(mimeType.Split('/')[0], mimeType.Split('/')[1], extension); + } + + /// + /// Converts file info to memory stream + /// + /// file info + /// memory stream for the file + private MemoryStream FileInfoToMemoryStream(FileInfo fileInfo) + { + MemoryStream memoryStream = new MemoryStream(); + BinaryReader reader = new BinaryReader(fileInfo.Open(FileMode.Open), Encoding.Default); + byte[] buffer = new byte[1024]; + int n = 0; + while ((n = reader.Read(buffer, 0, 1024)) > 0) + memoryStream.Write(buffer, 0, n); + return memoryStream; + } + + private bool hasConfig(AppSettingsReader appSettingsReader) + { + try + { + string s = (string)appSettingsReader.GetValue("txt", typeof(string)); + return true; + } + catch (InvalidOperationException e) + { + return false; + } + } + } +}