You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/12/12 12:16:09 UTC
svn commit: r1213206 [5/5] - in
/incubator/npanday/branches/1.5.0-azuresupport:
archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/
components/ components/dotnet-artifact/src/main/java/npanday/artifact/impl/
c...
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java?rev=1213206&r1=1213205&r2=1213206&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java Mon Dec 12 12:16:06 2011
@@ -24,6 +24,7 @@ import npanday.PlatformUnsupportedExcept
import npanday.artifact.AssemblyResolver;
import npanday.artifact.NPandayArtifactResolutionException;
import npanday.executable.CommandExecutor;
+import npanday.executable.ExecutableRequirement;
import npanday.executable.ExecutionException;
import npanday.executable.NetExecutable;
import npanday.executable.NetExecutableFactory;
@@ -424,7 +425,9 @@ extends AbstractMojo
Vendor vendor = vendorInfo.getVendor();
String vendorName = vendor.getVendorName();
- NetExecutable executable = netExecutableFactory.getNetExecutableFor( vendorName, executionFrameworkVersion, executableName, commands, executableHome );
+ NetExecutable executable = netExecutableFactory.getNetExecutableFor(
+ new ExecutableRequirement( vendorName, null, executionFrameworkVersion, executableName), commands, executableHome );
+
executable.execute();
}
catch (PlatformUnsupportedException pue)
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1213206&r1=1213205&r2=1213206&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java Mon Dec 12 12:16:06 2011
@@ -24,6 +24,7 @@ import npanday.artifact.ArtifactContext;
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;
@@ -171,8 +172,8 @@ public class VsInstallerMojo
try
{
NetExecutable netExecutable = netExecutableFactory.getNetExecutableFor(
- Vendor.MICROSOFT.getVendorName(), "2.0.50727", "GACUTIL", getGacInstallCommandsFor( artifacts.get(
- 0 ) ), null );
+ new ExecutableRequirement( Vendor.MICROSOFT.getVendorName(), null, "2.0.50727", "GACUTIL"),
+ getGacInstallCommandsFor( artifacts.get( 0 ) ), null );
netExecutable.execute();
getLog().info( "NPANDAY-1600-004: Installed Assembly into GAC: Assembly = " + artifacts.get(
0 ).getFile().getAbsolutePath() + ", Vendor = " + netExecutable.getVendor().getVendorName() );
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java?rev=1213206&r1=1213205&r2=1213206&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XmlToXsdGeneratorMojo.java Mon Dec 12 12:16:06 2011
@@ -19,6 +19,7 @@
package npanday.plugin.xsd;
import npanday.PlatformUnsupportedException;
+import npanday.executable.ExecutableRequirement;
import npanday.executable.ExecutionException;
import npanday.registry.RepositoryRegistry;
import org.apache.maven.plugin.AbstractMojo;
@@ -107,8 +108,7 @@ public class XmlToXsdGeneratorMojo
FileUtils.mkdir( outputDirectory );
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
- netHome ).execute();
+ netExecutableFactory.getNetExecutableFor( new ExecutableRequirement( vendor, null, frameworkVersion, profile ), getCommands(), netHome ).execute();
}
catch ( ExecutionException e )
{
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java?rev=1213206&r1=1213205&r2=1213206&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsd-plugin/src/main/java/npanday/plugin/xsd/XsdGeneratorMojo.java Mon Dec 12 12:16:06 2011
@@ -19,6 +19,7 @@
package npanday.plugin.xsd;
import npanday.PlatformUnsupportedException;
+import npanday.executable.ExecutableRequirement;
import npanday.executable.ExecutionException;
import npanday.registry.RepositoryRegistry;
import npanday.vendor.SettingsException;
@@ -186,8 +187,7 @@ public class XsdGeneratorMojo
FileUtils.mkdir( outputDirectory );
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
- netHome ).execute();
+ netExecutableFactory.getNetExecutableFor( new ExecutableRequirement( vendor, null, frameworkVersion, profile ), getCommands(), netHome ).execute();
}
catch ( ExecutionException e )
{
Modified: incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java?rev=1213206&r1=1213205&r2=1213206&view=diff
==============================================================================
--- incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java (original)
+++ incubator/npanday/branches/1.5.0-azuresupport/plugins/maven-xsp-plugin/src/main/java/npanday/plugin/xsp/XspStarterMojo.java Mon Dec 12 12:16:06 2011
@@ -18,6 +18,7 @@
*/
package npanday.plugin.xsp;
+import npanday.executable.ExecutableRequirement;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.AbstractMojo;
import npanday.PlatformUnsupportedException;
@@ -54,15 +55,18 @@ public class XspStarterMojo
*/
private npanday.executable.NetExecutableFactory netExecutableFactory;
- public void execute()
- throws MojoExecutionException
+ public void execute() throws MojoExecutionException
{
try
{
- Runnable executable = (Runnable) netExecutableFactory.getNetExecutableFor( Vendor.MONO.getVendorName(),
- frameworkVersion, "XSP:START",
- new ArrayList<String>(),
- netHome );
+ final ExecutableRequirement executableRequirement = new ExecutableRequirement(
+ Vendor.MONO.getVendorName(), null, frameworkVersion, "XSP:START"
+ );
+
+ Runnable executable = (Runnable) netExecutableFactory.getNetExecutableFor(
+ executableRequirement, new ArrayList<String>(), netHome
+ );
+
Thread thread = new Thread( executable );
getPluginContext().put( "xspThread", thread );
thread.start();