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=1331360&r1=1331359&r2=1331360&view=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 Fri Apr 27 11:39:13 2012 @@ -19,9 +19,6 @@ package npanday.plugin.vsinstaller; -import npanday.artifact.ArtifactContext; -import npanday.artifact.ArtifactInstaller; -import npanday.artifact.NPandayArtifactResolutionException; import npanday.registry.RepositoryRegistry; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFileFilter; @@ -77,13 +74,6 @@ public class VsInstallerMojo private String localRepository; /** - * Provides services for obtaining artifact information and dependencies - * - * @component - */ - private ArtifactContext artifactContext; - - /** * Provides access to configuration information used by NPanday. * * @component @@ -101,7 +91,6 @@ public class VsInstallerMojo public void execute() throws MojoExecutionException, MojoFailureException { - artifactContext.init( null, mavenProject.getRemoteArtifactRepositories(), new File( localRepository ) ); Map<String, ArtifactHandler> map = new HashMap<String, ArtifactHandler>(); for ( ArtifactHandler artifactHandler : artifactHandlers ) @@ -121,23 +110,7 @@ public class VsInstallerMojo mavenProject.getBuild().setDirectory( new File( mavenProject.getBasedir(), "target" ).getAbsolutePath() ); } - try - { - ArtifactInstaller installer = artifactContext.getArtifactInstaller(); - installer.resolveAndInstallNetDependenciesForProfile( "VisualStudio2005", null, null, mavenProject ); - } - catch ( NPandayArtifactResolutionException e ) - { - throw new MojoExecutionException( - "NPANDAY-121-002: Error resolving dependencies for 'VisualStudio2005'", e - ); - } - catch ( IOException e ) - { - throw new MojoExecutionException( - "NPANDAY-121-003: IO error on resolving dependencies for 'VisualStudio2005'", e - ); - } + getLog().warn( "NPANDAY-251: removed net dependency resolution for VS2005-profile here!" ); collectDefaultVSAddinDirectories();
Modified: incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/java/npanday/plugin/wsdl/WsdlGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/java/npanday/plugin/wsdl/WsdlGeneratorMojo.java?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/java/npanday/plugin/wsdl/WsdlGeneratorMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/java/npanday/plugin/wsdl/WsdlGeneratorMojo.java Fri Apr 27 11:39:13 2012 @@ -229,7 +229,7 @@ public class WsdlGeneratorMojo List<String> commands = getCommandsFor( webreference ); try { - netExecutableFactory.getNetExecutableFor( + netExecutableFactory.getExecutable( new ExecutableRequirement( vendor, null, frameworkVersion, profile ), commands, netHome ).execute(); } Modified: incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java Fri Apr 27 11:39:13 2012 @@ -115,7 +115,9 @@ public class XmlToXsdGeneratorMojo FileUtils.mkdir( outputDirectory ); try { - netExecutableFactory.getNetExecutableFor( new ExecutableRequirement( vendor, null, frameworkVersion, profile ), getCommands(), netHome ).execute(); + netExecutableFactory.getExecutable( + new ExecutableRequirement( vendor, null, frameworkVersion, profile ), getCommands(), netHome + ).execute(); } catch ( ExecutionException e ) { Modified: incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java Fri Apr 27 11:39:13 2012 @@ -177,7 +177,7 @@ public class XsdGeneratorMojo FileUtils.mkdir( outputDirectory ); try { - netExecutableFactory.getNetExecutableFor( + netExecutableFactory.getExecutable( new ExecutableRequirement( vendor, null, frameworkVersion, profile ), getCommands(), netHome ).execute(); } Modified: incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java Fri Apr 27 11:39:13 2012 @@ -78,7 +78,7 @@ public class XspStarterMojo Vendor.MONO.getVendorName(), null, frameworkVersion, "XSP:START" ); - Runnable executable = (Runnable) netExecutableFactory.getNetExecutableFor( + Runnable executable = (Runnable) netExecutableFactory.getExecutable( executableRequirement, new ArrayList<String>(), netHome ); Modified: 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=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java (original) +++ incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/AbstractMsDeployMojo.java Fri Apr 27 11:39:13 2012 @@ -127,8 +127,9 @@ public abstract class AbstractMsDeployMo try { - final NetExecutable executable = netExecutableFactory.getNetExecutableFor( - new ExecutableRequirement( vendor, vendorVersion, frameworkVersion, executableIdentifier ), getCommands(iterationItem), null + final NetExecutable executable = netExecutableFactory.getExecutable( + new ExecutableRequirement( vendor, vendorVersion, frameworkVersion, executableIdentifier ), + getCommands( iterationItem ), null ); executable.execute(); } Modified: incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java (original) +++ incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/MsDeployResolveWebRolesMojo.java Fri Apr 27 11:39:13 2012 @@ -37,7 +37,7 @@ import static com.google.common.collect. * @author <a href="mailto:[email protected]";>Lars Corneliussen</a> * * @goal resolve-azure-web-roles - * @requiresDependencyResolution compile + * TODO requiresDependencyResolution compile */ public class MsDeployResolveWebRolesMojo extends AbstractMsDeployMojo<UnpackDependencyIterationItem> Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/pom.xml Fri Apr 27 11:39:13 2012 @@ -38,11 +38,7 @@ <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId> Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/pom.xml Fri Apr 27 11:39:13 2012 @@ -38,11 +38,7 @@ <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId> Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/pom.xml Fri Apr 27 11:39:13 2012 @@ -39,11 +39,7 @@ <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId> Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java Fri Apr 27 11:39:13 2012 @@ -37,7 +37,7 @@ import org.codehaus.plexus.util.FileUtil /** * @phase validate * @goal compile - * @requiresDependencyResolution test + * TODO requiresDependencyResolution test */ public class MsbuildMojo extends npanday.plugin.AbstractMojo Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/pom.xml Fri Apr 27 11:39:13 2012 @@ -38,11 +38,7 @@ <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId> Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml (original) +++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/pom.xml Fri Apr 27 11:39:13 2012 @@ -38,11 +38,7 @@ under the License. <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId> Modified: incubator/npanday/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/pom.xml (original) +++ incubator/npanday/trunk/plugins/pom.xml Fri Apr 27 11:39:13 2012 @@ -43,7 +43,6 @@ <module>maven-link-plugin</module> <module>maven-mojo-generator-plugin</module> <module>maven-resgen-plugin</module> - <module>maven-repository-plugin</module> <module>maven-resolver-plugin</module> <module>maven-test-plugin</module> <module>maven-vsinstaller-plugin</module> @@ -68,18 +67,10 @@ </dependency> <dependency> <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-dao-project</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> </dependency> <dependency> <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId> </dependency> <dependency> Modified: incubator/npanday/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1331360&r1=1331359&r2=1331360&view=diff ============================================================================== --- incubator/npanday/trunk/pom.xml (original) +++ incubator/npanday/trunk/pom.xml Fri Apr 27 11:39:13 2012 @@ -415,21 +415,16 @@ under the License. <artifactId>dotnet-assembler</artifactId> <version>1.5.0-incubating-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-dao-project</artifactId> - <version>1.5.0-incubating-SNAPSHOT</version> - </dependency> - <dependency> + <artifactId>dotnet-dao-project</artifactId> + <version>1.5.0-incubating-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-executable</artifactId> <version>1.5.0-incubating-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.npanday</groupId> - <artifactId>dotnet-artifact</artifactId> - <version>1.5.0-incubating-SNAPSHOT</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.npanday</groupId> <artifactId>dotnet-plugin</artifactId>
