svn commit: r1220702 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java

2011-12-19 Thread brett 
Author: brett
Date: Mon Dec 19 12:01:49 2011
New Revision: 1220702

URL: http://svn.apache.org/viewvc?rev=1220702view=rev
Log:
fix version

Modified:

incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java?rev=1220702r1=1220701r2=1220702view=diff
==
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java
 Mon Dec 19 12:01:49 2011
@@ -25,7 +25,7 @@ public class NPANDAY_488_MSDeployPackage
 {
 public NPANDAY_488_MSDeployPackageSimpleWebApp()
 {
-super( [1.4.1-incubating,) );
+super( [1.5.0-incubating,) );
 }
 
 public void test()

[jira] [Work started] (NPANDAY-489) Implement path location for MSDeploy.exe (using Executable Plugins)

2011-12-19 Thread Lars Corneliussen (Work started) (JIRA) 

 [ 
https://issues.apache.org/jira/browse/NPANDAY-489?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Work on NPANDAY-489 started by Lars Corneliussen.

 Implement path location for MSDeploy.exe (using Executable Plugins)
 ---

 Key: NPANDAY-489
 URL: https://issues.apache.org/jira/browse/NPANDAY-489
 Project: NPanday
  Issue Type: Technical task
  Components: Maven Plugins, Visual Studio Add-in
Reporter: Lars Corneliussen
Assignee: Lars Corneliussen
 Fix For: 1.5.0-incubating


 Location of MSDeployPath should be implemented in a way that is reusable for 
 other plugins. Thinking a small DSL where we can query the system somehow to 
 find the correct path.
 {code:title=from Microsoft.Web.Publishing.targets}
   PropertyGroup
 !--Unless specified otherwise, the tools will go to 
 HKLM\SOFTWARE\Microsoft\IIS Extensions\MSDeploy\1 to get the installpath for 
 msdeploy.exe.--
 MSDeployPath 
 Condition='$(MSDeployPath)'==''$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\IIS
  Extensions\MSDeploy\3@InstallPath)/MSDeployPath
 MSDeployPath 
 Condition='$(MSDeployPath)'==''$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\IIS
  Extensions\MSDeploy\2@InstallPath)/MSDeployPath
 MSDeployPath 
 Condition='$(MSDeployPath)'==''$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\IIS
  Extensions\MSDeploy\1@InstallPath)/MSDeployPath
   /PropertyGroup
 {code}

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

[jira] [Resolved] (NPANDAY-489) Implement path location for MSDeploy.exe (using Executable Plugins)

2011-12-19 Thread Lars Corneliussen (Resolved) (JIRA) 

 [ 
https://issues.apache.org/jira/browse/NPANDAY-489?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Lars Corneliussen resolved NPANDAY-489.
---

Resolution: Fixed

 Implement path location for MSDeploy.exe (using Executable Plugins)
 ---

 Key: NPANDAY-489
 URL: https://issues.apache.org/jira/browse/NPANDAY-489
 Project: NPanday
  Issue Type: Technical task
  Components: Maven Plugins, Visual Studio Add-in
Reporter: Lars Corneliussen
Assignee: Lars Corneliussen
 Fix For: 1.5.0-incubating


 Location of MSDeployPath should be implemented in a way that is reusable for 
 other plugins. Thinking a small DSL where we can query the system somehow to 
 find the correct path.
 {code:title=from Microsoft.Web.Publishing.targets}
   PropertyGroup
 !--Unless specified otherwise, the tools will go to 
 HKLM\SOFTWARE\Microsoft\IIS Extensions\MSDeploy\1 to get the installpath for 
 msdeploy.exe.--
 MSDeployPath 
 Condition='$(MSDeployPath)'==''$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\IIS
  Extensions\MSDeploy\3@InstallPath)/MSDeployPath
 MSDeployPath 
 Condition='$(MSDeployPath)'==''$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\IIS
  Extensions\MSDeploy\2@InstallPath)/MSDeployPath
 MSDeployPath 
 Condition='$(MSDeployPath)'==''$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\IIS
  Extensions\MSDeploy\1@InstallPath)/MSDeployPath
   /PropertyGroup
 {code}

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

[jira] [Updated] (NPANDAY-499) Make configuration for compiler-plugins and executable-plugins more flexible

2011-12-19 Thread Lars Corneliussen (Updated) (JIRA) 

 [ 
https://issues.apache.org/jira/browse/NPANDAY-499?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Lars Corneliussen updated NPANDAY-499:
--

Description: 
Currently all configuration for compiler-plugins and executable-plugins are 
located centrally in {{dotnet-core/main/resources/META-INF/npanday/*.xml}}.

1) (/) The configuration should be split up into multiple files
2) (/) Plugins should be able to contribute their own configurations (for 
example: the test-plugin should specify where to find nunit; currently it is 
specified in dotnet-core)
3) It should be possible to configure executableVersion additionally to 
vendorVersion and frameworkVersion (for example in order to locate path's for 
Azure Tools 1.6 specifically, but only when on MICROSOFT 4.0+ and Windows.
4) (/) Enable filtering in configuration files, supporting Windows Registry, 
Environment Variables and (!) project properties
5) Enable version ranges for matching of versions in executables and compilers 
for vendorVersion, frameworkVersion and executableVersion(to come) {{[1.1,)}] 
or {{[2.0,3.0)}}
6) Rename 'plugin' to configuration for executable-plugins and compiler-plugins
7) Use 'identifier' instead of 'profile' for locating the correct 
executable-plugin.
8) Join executable-plugins and compiler-plugins into one model (the latter 
extending the latter)
9) Replace MutableCompilerConfiguration and MutableExectuableConfiguration with 
compositions based on configurations / are pojos instructed from the outside now
10) ..



  was:
Currently all configuration for compiler-plugins and executable-plugins are 
located centrally in {{dotnet-core/main/resources/META-INF/npanday/*.xml}}.

1) (/) The configuration should be split up into multiple files
2) (/) Plugins should be able to contribute their own configurations (for 
example: the test-plugin should specify where to find nunit; currently it is 
specified in dotnet-core)
3) It should be possible to configure executable-versions additionally to 
vendor- and framework-versions (for example in order to locate path's for Azure 
Tools 1.6 specifically, but only when on MICROSOFT 4.0+ and Windows.


 Make configuration for compiler-plugins and executable-plugins more flexible
 

 Key: NPANDAY-499
 URL: https://issues.apache.org/jira/browse/NPANDAY-499
 Project: NPanday
  Issue Type: Improvement
  Components: Maven Plugins
Reporter: Lars Corneliussen
Assignee: Lars Corneliussen
 Fix For: 1.5.0-incubating


 Currently all configuration for compiler-plugins and executable-plugins are 
 located centrally in {{dotnet-core/main/resources/META-INF/npanday/*.xml}}.
 1) (/) The configuration should be split up into multiple files
 2) (/) Plugins should be able to contribute their own configurations (for 
 example: the test-plugin should specify where to find nunit; currently it is 
 specified in dotnet-core)
 3) It should be possible to configure executableVersion additionally to 
 vendorVersion and frameworkVersion (for example in order to locate path's for 
 Azure Tools 1.6 specifically, but only when on MICROSOFT 4.0+ and Windows.
 4) (/) Enable filtering in configuration files, supporting Windows Registry, 
 Environment Variables and (!) project properties
 5) Enable version ranges for matching of versions in executables and 
 compilers for vendorVersion, frameworkVersion and executableVersion(to come) 
 {{[1.1,)}] or {{[2.0,3.0)}}
 6) Rename 'plugin' to configuration for executable-plugins and 
 compiler-plugins
 7) Use 'identifier' instead of 'profile' for locating the correct 
 executable-plugin.
 8) Join executable-plugins and compiler-plugins into one model (the latter 
 extending the latter)
 9) Replace MutableCompilerConfiguration and MutableExectuableConfiguration 
 with compositions based on configurations / are pojos instructed from the 
 outside now
 10) ..

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

svn commit: r1220830 - in /incubator/npanday/trunk: components/dotnet-executable/src/main/java/npanday/executable/ components/dotnet-executable/src/main/java/npanday/executable/compiler/ components/do

2011-12-19 Thread lcorneliussen 
Author: lcorneliussen
Date: Mon Dec 19 16:27:41 2011
New Revision: 1220830

URL: http://svn.apache.org/viewvc?rev=1220830view=rev
Log:
[NPANDAY-499] Make configuration for compiler-plugins and executable-plugins 
more flexible

o Removed resetCommands from NetExecutable
o Fixed type in windows registry access
o fixed: Settings were accessed before initialization

Added:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/   (with props)
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/   (with props)
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/   (with 
props)
Modified:

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/MutableExecutableCapability.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutable.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/MutableCompilerCapability.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/AspxCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/CSharpCompilerForProfile.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DotGNUCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/JavaCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/NemerleCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/PhpCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/RubyCompiler.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CapabilityMatcherImpl.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultNetExecutable.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/DefaultRepositoryNetExecutable.java

incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/ExecutablePluginsRepository.java
incubator/npanday/trunk/components/dotnet-model/pom.xml

incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/WindowsRegistryAccessProvider.java

incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/AbstractMultisourceRepository.java

incubator/npanday/trunk/components/dotnet-registry/src/main/java/npanday/registry/impl/WindowsRegistryValueSource.java

incubator/npanday/trunk/components/dotnet-registry/src/test/groovy/WindowsRegistryValueSourceTest.groovy

incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/impl/StateMachineProcessorImpl.java

Modified: 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/MutableExecutableCapability.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/MutableExecutableCapability.java?rev=1220830r1=1220829r2=1220830view=diff
==
--- 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/MutableExecutableCapability.java
 (original)
+++ 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/MutableExecutableCapability.java
 Mon Dec 19 16:27:41 2011
@@ -173,4 +173,11 @@ public class MutableExecutableCapability
 {
 this.probingPaths = probingPaths;
 }
+
+@Override
+public String toString()
+{
+return ExecutableCapability [ + vendorInfo= + vendorInfo + , 
operatingSystem=' + operatingSystem
++ '\'' + , profile=' + profile + '\'' + ']';
+}
 }

Modified: 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutable.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutable.java?rev=1220830r1=1220829r2=1220830view=diff
==
--- 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutable.java
 (original)
+++ 
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/NetExecutable.java
 Mon Dec 19 16:27:41 2011
@@ -29,6 +29,8 @@ import java.io.File;
  * Provides services for executing programs.
  *
  * @author Shane Isbell
+ * @author a href=mailto:lcornelius...@apache.org;Lars

svn commit: r1220834 - in /incubator/npanday/trunk/plugins/msdeploy-maven-plugin: ./ src/main/java/ src/main/java/npanday.plugin.msdeploy/ src/main/resources/ src/main/resources/META-INF/ src/main/res

2011-12-19 Thread lcorneliussen 
Author: lcorneliussen
Date: Mon Dec 19 16:37:51 2011
New Revision: 1220834

URL: http://svn.apache.org/viewvc?rev=1220834view=rev
Log:
[NPANDAY-488] Packaging for Web Applications (also Azure Web Roles)

o Initial msdeploy plugin and configuration for zero-classifier packaging

Added:
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/pom.xml
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/   
(with props)

incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/
   (with props)

incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/AbstractMsDeployMojo.java

incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/MsDeployCreatePackageMojo.java
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/   
(with props)

incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/
   (with props)

incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/
   (with props)

incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/site/   (with 
props)
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/site/site.xml

Added: incubator/npanday/trunk/plugins/msdeploy-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/pom.xml?rev=1220834view=auto
==
--- incubator/npanday/trunk/plugins/msdeploy-maven-plugin/pom.xml (added)
+++ incubator/npanday/trunk/plugins/msdeploy-maven-plugin/pom.xml Mon Dec 19 
16:37:51 2011
@@ -0,0 +1,16 @@
+?xml version=1.0 encoding=UTF-8?
+project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns=http://maven.apache.org/POM/4.0.0;
+xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  modelVersion4.0.0/modelVersion
+  parent
+artifactIdmaven-dotnet-plugins/artifactId
+groupIdorg.apache.npanday.plugins/groupId
+version1.5.0-incubating-SNAPSHOT/version
+  /parent
+  groupIdorg.apache.npanday.plugins/groupId
+  artifactIdmsdeploy-maven-plugin/artifactId
+  packagingmaven-plugin/packaging
+
+  nameNPanday :: MSDeploy Maven Plugin/name
+  descriptionMaven Plugin for Microsoft Web Deploy/description
+/project

Propchange: incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/
--
bugtraq:number = true

Propchange: 
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/
--
bugtraq:number = true

Added: 
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/AbstractMsDeployMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/AbstractMsDeployMojo.java?rev=1220834view=auto
==
--- 
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/AbstractMsDeployMojo.java
 (added)
+++ 
incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday.plugin.msdeploy/AbstractMsDeployMojo.java
 Mon Dec 19 16:37:51 2011
@@ -0,0 +1,137 @@
+/*
+ * 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 npanday.plugin.msdeploy;
+
+import npanday.PlatformUnsupportedException;
+import npanday.executable.ExecutableRequirement;
+import npanday.executable.ExecutionException;
+import npanday.executable.NetExecutable;
+import npanday.registry.RepositoryRegistry;
+import npanday.vendor.SettingsUtil;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+
+import java.util.List;
+
+
+/**
+ * @author a

svn commit: r1220835 - in /incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp: assembly.xml pom.xml

2011-12-19 Thread lcorneliussen 
Author: lcorneliussen
Date: Mon Dec 19 16:41:02 2011
New Revision: 1220835

URL: http://svn.apache.org/viewvc?rev=1220835view=rev
Log:
[NPANDAY-488] MSDeploy packaging (without config transforms)

Removed:

incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/assembly.xml
Modified:

incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml

Modified: 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml?rev=1220835r1=1220834r2=1220835view=diff
==
--- 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.xml
 Mon Dec 19 16:41:02 2011
@@ -12,13 +12,17 @@
 version1-SNAPSHOT/version
   /parent
  
-  groupIdNPANDAY_488_MSDeployPackageSimpleWebApp/groupId
+  groupIdNPanday.ITs.NPANDAY_488_MSDeployPackageSimpleWebApp/groupId
   artifactIdHelloWorld_WebRole/artifactId
   packagingdotnet-library/packaging
   version1.0.0-SNAPSHOT/version
 
   nameNPanday.ITs.NPANDAY_488_MSDeployPackageSimpleWebApp :: Hello World Web 
Role/name
 
+  properties
+frameworkVersion4.0/frameworkVersion
+  /properties
+
   profiles
 profile
   idstandalone/id
@@ -28,7 +32,7 @@
 /property
   /activation
   properties
-npanday.version1.5.0-azuresupport-SNAPSHOT/npanday.version
+npanday.version1.5.0-incubating-SNAPSHOT/npanday.version
   /properties
   build
 pluginManagement
@@ -61,81 +65,30 @@
 extensionstrue/extensions
   /plugin
   plugin
-artifactIdmaven-assembly-plugin/artifactId
-version2.2.1/version
-executions
-  execution
-idassemble/id
-phaseprepare-package/phase
-goals
-  goalsingle/goal
-/goals
-configuration
-  finalNameprepare-package/finalName
-  appendAssemblyIdfalse/appendAssemblyId
-  attachfalse/attach
-  descriptors
-descriptorassembly.xml/descriptor
-  /descriptors
-/configuration
-  /execution
-/executions
-  /plugin
-  plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
+groupIdorg.apache.npanday.plugins/groupId
+artifactIdaspnet-maven-plugin/artifactId
+version${npanday.version}/version
 executions
   execution
-idxdt-transform/id
+idprepare-package/id
 phaseprepare-package/phase
 goals
-  goalexec/goal
-/goals
-configuration
-  executablemsbuild/executable
-  arguments
-argumentcopy-transformed.xml/argument
-
argument/p:WorkDirectory=${build.directory}/prepare-package/argument
-  /arguments
-/configuration
-  /execution
-  execution
-idmsbuild/id
-phasepackage/phase
-goals
-  goalexec/goal
+  goalassemble-package-files/goal
 /goals
-configuration
-  executablemsdeploy/executable
-  arguments
-argument-verb:sync/argument
-
argument-source:dirPath=${build.directory}/prepare-package/03-transformed/argument
-
argument-dest:package=${build.directory}/${artifactId}.msdeploy.zip/argument
-  /arguments
-/configuration
   /execution
 /executions
   /plugin
   plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdbuild-helper-maven-plugin/artifactId
-version1.7/version
+groupIdorg.apache.npanday.plugins/groupId
+artifactIdmsdeploy-maven-plugin/artifactId
+version${npanday.version}/version
 executions
   execution
-idadd-msdeploy-package/id
+idcreate-msdeploy-package/id
 phasepackage/phase
 goals
-  goalattach-artifact/goal
+  goalcreate-package/goal
 /goals
-configuration
-  artifacts
-artifact
-  file${build.directory}/${artifactId}.msdeploy.zip/file
-  typemsdeploy-package/type
-/artifact
-  /artifacts
-/configuration
   /execution
 /executions
   /plugin

svn commit: r1221075 - in /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its: AbstractNPandayIntegrationTestCase.java AddInInstallationTest.java IntegrationTestSuite.java

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 02:26:25 2011
New Revision: 1221075

URL: http://svn.apache.org/viewvc?rev=1221075view=rev
Log:
add an integration test that verifies that NPanday assemblies were built with
the right version of .NET framework

Added:

incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
   (with props)
Modified:

incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java

incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1221075r1=1221074r2=1221075view=diff
==
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
 Tue Dec 20 02:26:25 2011
@@ -62,7 +62,7 @@ public abstract class AbstractNPandayInt
 
 private static final String NPANDAY_VERSION_SYSTEM_PROPERTY = 
npanday.version;
 
-private static DefaultArtifactVersion version = checkVersion();
+protected static DefaultArtifactVersion version = checkVersion();
 
 private static DefaultArtifactVersion frameworkVersion = 
checkFrameworkVersion();
 
@@ -578,6 +578,42 @@ public abstract class AbstractNPandayInt
 return false;
 }
 
+private String getAssemblyFrameworkVersion( File assembly )
+throws VerificationException
+{
+String output = runILDisasm( assembly.getAbsolutePath() );
+
+String prefix = // Metadata version: v;
+for ( String line : output.split( \n ) )
+{
+line = line.trim();
+if ( line.startsWith( prefix ) )
+{
+return line.substring( prefix.length() ).trim();
+}
+}
+return null;
+}
+
+private boolean isAssemblyFrameworkVersion( File assembly, String 
versionRangeStr )
+throws VerificationException
+{
+String frameworkVersion = getAssemblyFrameworkVersion( assembly );
+VersionRange versionRange = createVersionRange( versionRangeStr );
+return versionRange.containsVersion( new DefaultArtifactVersion( 
frameworkVersion ) );
+}
+
+protected void assertAssemblyFrameworkVersion( File assembly, String 
versionRangeStr )
+throws VerificationException
+{
+String frameworkVersion = getAssemblyFrameworkVersion( assembly );
+VersionRange versionRange = createVersionRange( versionRangeStr );
+if ( !versionRange.containsVersion( new DefaultArtifactVersion( 
frameworkVersion ) ) )
+{
+fail( Framework version  + frameworkVersion +  is not in range 
 + versionRangeStr );
+}
+}
+
 protected static boolean checkNPandayVersion( String versionRangeStr )
 {
 return checkNPandayVersion( createVersionRange( versionRangeStr ), 
version ) || forceVersion;

Added: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java?rev=1221075view=auto
==
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
 (added)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
 Tue Dec 20 02:26:25 2011
@@ -0,0 +1,85 @@
+package npanday.its;
+
+/*
+ * Copyright 2010
+ *
+ * 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.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+public class AddInInstallationTest
+extends AbstractNPandayIntegrationTestCase
+{
+public AddInInstallationTest()
+{
+

svn commit: r1221087 - /incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 03:24:03 2011
New Revision: 1221087

URL: http://svn.apache.org/viewvc?rev=1221087view=rev
Log:
no longer necessary to install artifacts in the GAC

Modified:

incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java

Modified: 
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1221087r1=1221086r2=1221087view=diff
==
--- 
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
 (original)
+++ 
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
 Tue Dec 20 03:24:03 2011
@@ -19,18 +19,11 @@
 
 package npanday.plugin.vsinstaller;
 
-import npanday.PlatformUnsupportedException;
 import npanday.artifact.ArtifactContext;
 import npanday.artifact.ArtifactInstaller;
 import npanday.artifact.NPandayArtifactResolutionException;
 import npanday.artifact.NetDependenciesRepository;
-import npanday.artifact.NetDependencyMatchPolicy;
-import npanday.executable.ExecutableRequirement;
-import npanday.executable.ExecutionException;
-import npanday.executable.NetExecutable;
-import npanday.model.netdependency.NetDependency;
 import npanday.registry.RepositoryRegistry;
-import npanday.vendor.Vendor;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
@@ -38,15 +31,12 @@ import org.apache.commons.io.filefilter.
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.util.IOUtil;
 
-import javax.swing.filechooser.FileSystemView;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -55,6 +45,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.swing.filechooser.FileSystemView;
 
 /**
  * Installs Visual Studio 2005 addin.
@@ -102,39 +93,17 @@ public class VsInstallerMojo
  */
 private RepositoryRegistry repositoryRegistry;
 
-/**
- * Provides services to obtain executables.
- *
- * @component
- */
-private npanday.executable.NetExecutableFactory netExecutableFactory;
-
 /** @component role=org.apache.maven.artifact.handler.ArtifactHandler */
 private ListArtifactHandler artifactHandlers;
 
 /** @component */
 private ArtifactHandlerManager artifactHandlerManager;
 
-/**
- * @parameter expression=${settings}
- */
-private Settings settings;
-
 private FileSystemView filesystemView = FileSystemView.getFileSystemView();
 
 public void execute()
 throws MojoExecutionException, MojoFailureException
 {
-
-File logs = new File( localRepository, embedder-logs );
-if ( !logs.exists() )
-{
-logs.mkdir();
-}
-
-NetDependenciesRepository netRepository = (NetDependenciesRepository) 
repositoryRegistry.find(
-net-dependencies );
-
 artifactContext.init( null, 
mavenProject.getRemoteArtifactRepositories(), new File( localRepository ) );
 MapString, ArtifactHandler map = new HashMapString, 
ArtifactHandler();
 
@@ -162,34 +131,6 @@ public class VsInstallerMojo
 throw new MojoExecutionException( e.getMessage(), e );
 }
 
-// GAC Installs
-ListNetDependencyMatchPolicy gacInstallPolicies = new 
ArrayListNetDependencyMatchPolicy();
-gacInstallPolicies.add( new GacMatchPolicy( true ) );
-ListDependency gacInstallDependencies = 
netRepository.getDependenciesFor( gacInstallPolicies );
-for ( Dependency dependency : gacInstallDependencies )
-{
-ListArtifact artifacts = artifactContext.getArtifactsFor( 
dependency.getGroupId(),
-
dependency.getArtifactId(),
-
dependency.getVersion(), dependency.getType() );
-try
-{
-NetExecutable netExecutable = 
netExecutableFactory.getNetExecutableFor(
-new ExecutableRequirement( 
Vendor.MICROSOFT.getVendorName(), null,

svn commit: r1221088 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 03:32:36 2011
New Revision: 1221088

URL: http://svn.apache.org/viewvc?rev=1221088view=rev
Log:
adjust name and add a comment

Modified:

incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java?rev=1221088r1=1221087r2=1221088view=diff
==
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
 Tue Dec 20 03:32:36 2011
@@ -35,9 +35,12 @@ public class AddInInstallationTest
 super( [1.0.2,) );
 }
 
-public void testBootstrap()
+public void testAddInInstallation()
 throws Exception
 {
+// TODO: these tests are still useful even if we remove the 
vsinstaller plugin - in that case, we need an
+//   alternate way to obtain the visualstudio.addin artifact from 
the repository
+
 ListString artifacts;
 String groupId;
 if ( checkNPandayVersion( createVersionRange( (,1.4.0) ), version ) 
)

svn commit: r1221094 - in /incubator/npanday/branches/npanday-1.4.x: ./ plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 04:32:39 2011
New Revision: 1221094

URL: http://svn.apache.org/viewvc?rev=1221094view=rev
Log:
improve logging on settings generation

Modified:
incubator/npanday/branches/npanday-1.4.x/   (props changed)

incubator/npanday/branches/npanday-1.4.x/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java

Propchange: incubator/npanday/branches/npanday-1.4.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 04:32:39 2011
@@ -1,3 +1,4 @@
 /incubator/npanday/branches/NPANDAY-410:1210743-1210765
 /incubator/npanday/branches/npanday-uac-removed:1002005-1024539
 /incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
+/incubator/npanday/trunk:1221092

Modified: 
incubator/npanday/branches/npanday-1.4.x/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java?rev=1221094r1=1221093r2=1221094view=diff
==
--- 
incubator/npanday/branches/npanday-1.4.x/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
 (original)
+++ 
incubator/npanday/branches/npanday-1.4.x/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
 Tue Dec 20 04:32:39 2011
@@ -165,11 +165,13 @@ public class SettingsGeneratorMojo
 {
 if ( !System.getProperty( os.name ).contains( Windows ) )
 {
+getLog().info( NPANDAY-119-001: Skipping settings generation, 
only valid on Windows operating systems );
 return false;
 }
 
 if ( skip )
 {
+getLog().info( NPANDAY-119-000: Excecution of generate-settings 
has been skipped. );
 return false;
 }
 
@@ -182,11 +184,13 @@ public class SettingsGeneratorMojo
 {
 if ( isFrameworkVersionExisting( frameworkVersion ) )
 {
+getLog().info( NPANDAY-119-002: Skipping settings 
generation, requested framework  + frameworkVersion +  is already configured 
);
 return false;
 }
 }
 catch ( IOException e )
 {
+getLog().info( NPANDAY-119-003: Skipping settings generation, 
error reading existing file:  + e.getLocalizedMessage() );
 return false;
 }
 }

svn commit: r1221095 - in /incubator/npanday/branches/npanday-1.4.x: ./ plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 04:39:04 2011
New Revision: 1221095

URL: http://svn.apache.org/viewvc?rev=1221095view=rev
Log:
no longer necessary to install artifacts in the GAC

Modified:
incubator/npanday/branches/npanday-1.4.x/   (props changed)

incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java

Propchange: incubator/npanday/branches/npanday-1.4.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 04:39:04 2011
@@ -1,4 +1,4 @@
 /incubator/npanday/branches/NPANDAY-410:1210743-1210765
 /incubator/npanday/branches/npanday-uac-removed:1002005-1024539
 /incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
-/incubator/npanday/trunk:1221092
+/incubator/npanday/trunk:1221087,1221092

Modified: 
incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1221095r1=1221094r2=1221095view=diff
==
--- 
incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
 (original)
+++ 
incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
 Tue Dec 20 04:39:04 2011
@@ -19,26 +19,18 @@
 
 package npanday.plugin.vsinstaller;
 
-import npanday.PlatformUnsupportedException;
 import npanday.artifact.ArtifactContext;
 import npanday.artifact.ArtifactInstaller;
 import npanday.artifact.NPandayArtifactResolutionException;
 import npanday.artifact.NetDependenciesRepository;
-import npanday.artifact.NetDependencyMatchPolicy;
-import npanday.executable.ExecutionException;
-import npanday.executable.NetExecutable;
-import npanday.model.netdependency.NetDependency;
 import npanday.registry.NPandayRepositoryException;
 import npanday.registry.RepositoryRegistry;
-import npanday.vendor.Vendor;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.apache.commons.io.filefilter.*;
 import org.apache.commons.io.FileUtils;
@@ -100,55 +92,17 @@ public class VsInstallerMojo
  */
 private npanday.NPandayRepositoryRegistry npandayRegistry;
 
-/**
- * Provides services to obtain executables.
- *
- * @component
- */
-private npanday.executable.NetExecutableFactory netExecutableFactory;
-
 /** @component role=org.apache.maven.artifact.handler.ArtifactHandler */
 private ListArtifactHandler artifactHandlers;
 
 /** @component */
 private ArtifactHandlerManager artifactHandlerManager;
 
-/**
- * @parameter expression=${settings}
- */
-private Settings settings;
-
 private FileSystemView filesystemView = FileSystemView.getFileSystemView();
 
 public void execute()
 throws MojoExecutionException, MojoFailureException
 {
-
-File logs = new File( localRepository, embedder-logs );
-if ( !logs.exists() )
-{
-logs.mkdir();
-}
-
-RepositoryRegistry repositoryRegistry;
-try
-{
-repositoryRegistry = npandayRegistry.createRepositoryRegistry();
-}
-catch ( IOException e )
-{
-throw new MojoExecutionException(
-NPANDAY-1600-000: Failed to create the repository registry 
for this plugin, e );
-}
-catch( NPandayRepositoryException e )
-{
-throw new MojoExecutionException(
-NPANDAY-1600-007: Failed to create the repository registry 
for this plugin, e );
-}
-
-NetDependenciesRepository netRepository = (NetDependenciesRepository) 
repositoryRegistry.find(
-net-dependencies );
-
 artifactContext.init( null, 
mavenProject.getRemoteArtifactRepositories(), new File( localRepository ) );
 MapString, ArtifactHandler map = new HashMapString, 
ArtifactHandler();
 
@@ -176,34 +130,6 @@ public class VsInstallerMojo
 throw new MojoExecutionException( e.getMessage(), e );
 }
 
-// GAC Installs
-ListNetDependencyMatchPolicy gacInstallPolicies = new 
ArrayListNetDependencyMatchPolicy();
-gacInstallPolicies.add( new GacMatchPolicy( true ) );
-

svn commit: r1221124 - in /incubator/npanday/branches/npanday-1.4.x: ./ plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 07:04:31 2011
New Revision: 1221124

URL: http://svn.apache.org/viewvc?rev=1221124view=rev
Log:
merge enhancements to VSInstaller Mojo from trunk

Modified:
incubator/npanday/branches/npanday-1.4.x/   (props changed)

incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java

Propchange: incubator/npanday/branches/npanday-1.4.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 07:04:31 2011
@@ -1,4 +1,4 @@
 /incubator/npanday/branches/NPANDAY-410:1210743-1210765
 /incubator/npanday/branches/npanday-uac-removed:1002005-1024539
 /incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
-/incubator/npanday/trunk:1221087,1221092
+/incubator/npanday/trunk:1221087,1221092,1221101,1221116

Modified: 
incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1221124r1=1221123r2=1221124view=diff
==
--- 
incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
 (original)
+++ 
incubator/npanday/branches/npanday-1.4.x/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
 Tue Dec 20 07:04:31 2011
@@ -22,16 +22,13 @@ package npanday.plugin.vsinstaller;
 import npanday.artifact.ArtifactContext;
 import npanday.artifact.ArtifactInstaller;
 import npanday.artifact.NPandayArtifactResolutionException;
-import npanday.artifact.NetDependenciesRepository;
 import npanday.registry.NPandayRepositoryException;
 import npanday.registry.RepositoryRegistry;
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.settings.Settings;
 import org.apache.commons.io.filefilter.*;
 import org.apache.commons.io.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -116,6 +113,13 @@ public class VsInstallerMojo
 }
 artifactHandlerManager.addHandlers( map );
 
+// in case Maven doesn't populate the base directory
+if ( mavenProject.getBasedir() == null || ${project.basedir}.equals( 
mavenProject.getBasedir().getName() ) )
+{
+mavenProject.setBasedir( new File( System.getProperty( user.dir 
) ) );
+mavenProject.getBuild().setDirectory( new File( 
mavenProject.getBasedir(), target ).getAbsolutePath() );
+}
+
 try
 {
 ArtifactInstaller installer = 
artifactContext.getArtifactInstaller();
@@ -232,14 +236,11 @@ public class VsInstallerMojo
 {
 try
 {
-String src = System.getProperty( user.dir ) + File.separator + 
target;
-
-File srcFolder = new File( src );
-
 IOFileFilter dllSuffixFilter = FileFilterUtils.suffixFileFilter( 
.dll );
 IOFileFilter dllFiles = FileFilterUtils.andFileFilter( 
FileFileFilter.FILE, dllSuffixFilter );
 
-FileUtils.copyDirectory(srcFolder, installationLocation, dllFiles, 
true);
+FileUtils.copyDirectory( new File( 
mavenProject.getBuild().getDirectory() ), installationLocation, dllFiles,
+ true );
 }
 
 catch ( IOException e )
@@ -254,12 +255,22 @@ public class VsInstallerMojo
 {
 String programFilesPath = System.getenv( PROGRAMFILES );
 
-if ( programFilesPath == null || programFilesPath.length() == 0 )
+if ( programFilesPath != null  programFilesPath.length() != 0 )
 {
-programFilesPath = System.getProperty( user.dir );
-}
+installationLocation = new File ( programFilesPath, 
NPanday/bin );
 
-installationLocation = new File ( programFilesPath, NPanday/bin 
);
+if ( !installationLocation.exists() )
+{
+if ( !installationLocation.mkdirs() )
+{
+installationLocation = new File( System.getProperty( 
user.home ), NPanday/bin );
+}
+}
+}
+else
+{
+installationLocation = new File( System.getProperty( 
user.home ), NPanday/bin );
+}
 }
 else
 {

svn commit: r1221125 - in /incubator/npanday/branches/npanday-1.4.x: ./ components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java dotnet/pom.xml

2011-12-19 Thread brett 
Author: brett
Date: Tue Dec 20 07:06:41 2011
New Revision: 1221125

URL: http://svn.apache.org/viewvc?rev=1221125view=rev
Log:
merge fix for plugin resolution from trunk

Modified:
incubator/npanday/branches/npanday-1.4.x/   (props changed)

incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml

Propchange: incubator/npanday/branches/npanday-1.4.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 07:06:41 2011
@@ -1,4 +1,4 @@
 /incubator/npanday/branches/NPANDAY-410:1210743-1210765
 /incubator/npanday/branches/npanday-uac-removed:1002005-1024539
 /incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
-/incubator/npanday/trunk:1221087,1221092,1221101,1221116
+/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117

Modified: 
incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1221125r1=1221124r2=1221125view=diff
==
--- 
incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
 (original)
+++ 
incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
 Tue Dec 20 07:06:41 2011
@@ -162,7 +162,7 @@ public abstract class AbstractMojo
 artifactContext.init( project, 
project.getRemoteArtifactRepositories(), new File( localRepository ) );
 
 Artifact artifact = 
getNetExecutableFactory().getArtifactFor(getMojoGroupId(), getMojoArtifactId());
-resolveArtifact(artifact, targetDir );
+resolveArtifact(project, artifact, targetDir);
 getNetExecutableFactory().getPluginLoaderFor( artifact, 
vendorInfo, localRepository, paramFile,
   getClassName(), 
targetDir ).execute();
 }
@@ -184,7 +184,9 @@ public abstract class AbstractMojo
 postExecute();
 }
 
-private void resolveArtifact( Artifact artifact, File targetDir ) throws 
ComponentLookupException, MojoExecutionException {
+private void resolveArtifact( MavenProject project, Artifact artifact, 
File targetDir )
+throws ComponentLookupException, MojoExecutionException
+{
 File localRepository = new File(getLocalRepository());
 
 if (PathUtil.getPrivateApplicationBaseFileFor(artifact, 
localRepository, targetDir ).exists())
@@ -205,8 +207,9 @@ public abstract class AbstractMojo
 
 try
 {
-assemblyResolver.resolveTransitivelyFor(new MavenProject(), 
Collections.singletonList(dependency), 
getMavenProject().getRemoteArtifactRepositories(),
-localRepository, false);
+assemblyResolver.resolveTransitivelyFor( project, 
Collections.singletonList( dependency ),
+ 
project.getRemoteArtifactRepositories(), localRepository,
+ false );
 }
 catch( NPandayArtifactResolutionException e )
 {

Modified: incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml?rev=1221125r1=1221124r2=1221125view=diff
==
--- incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml (original)
+++ incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml Tue Dec 20 07:06:41 
2011
@@ -104,9 +104,6 @@ under the License.
   groupIdorg.apache.npanday.plugins/groupId
   artifactIdNPanday.Plugin.Settings.JavaBinding/artifactId
   version${bootstrap.npanday.version}/version
-  configuration
-skiptrue/skip
-  /configuration
 /plugin
   /plugins
 /pluginManagement