You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/05/13 23:05:51 UTC
svn commit: r537675 - in /incubator/nmaven/branches/SI_XPT:
archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/
components/ components/dotnet-core/src/main/resources/META-INF/nmaven/
components/dotnet-executab...
Author: sisbell
Date: Sun May 13 16:05:48 2007
New Revision: 537675
URL: http://svn.apache.org/viewvc?view=rev&rev=537675
Log:
Maven plugin for starting up NMaven embedder services.
Added:
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/pom.xml (with props)
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/
incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java (with props)
Modified:
incubator/nmaven/branches/SI_XPT/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java
incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java
incubator/nmaven/branches/SI_XPT/components/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/GacInstallerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/LinkerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStarterMojo.java
Modified: incubator/nmaven/branches/SI_XPT/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java/NetExecutableMojo.java Sun May 13 16:05:48 2007
@@ -77,7 +77,7 @@
{
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, project, getCommands(),
+ netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
null ).execute();
}
catch ( ExecutionException e )
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml Sun May 13 16:05:48 2007
@@ -1,5 +1,20 @@
<executablePlugins>
<executablePlugin>
+ <identifier>dotnet-jetty</identifier>
+ <pluginClass>org.apache.maven.dotnet.executable.impl.ThreadedNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>java</executable>
+ <profile>dotnet-jetty:start</profile>
+ <frameworkVersions>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ </executablePlugin>
+ <executablePlugin>
<identifier>MONO:XSP</identifier>
<pluginClass>org.apache.maven.dotnet.executable.impl.ThreadedNetExecutable</pluginClass>
<vendor>MONO</vendor>
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java Sun May 13 16:05:48 2007
@@ -28,6 +28,7 @@
import org.apache.maven.dotnet.executable.compiler.CompilerConfig;
import org.apache.maven.dotnet.executable.compiler.CompilerExecutable;
import org.apache.maven.dotnet.PlatformUnsupportedException;
+import org.apache.maven.artifact.Artifact;
/**
* Provides services to obtain executables. This interface is intended to be used by <code>AbstractMojo</code>
@@ -51,15 +52,14 @@
* @param frameworkVersion the version of the .NET framework that the executable works under
* @param profile the profile of the executable plugin. This is used to differentiate an executable that
* matches the same platform and framework version.
- * @param project the maven project
* @param commands the user-defined command options to use with the executable
* @param netHome the install root of the .NET framework
* @return the executable that matches the vendor, framework version and profile
* @throws org.apache.maven.dotnet.PlatformUnsupportedException
* if no executable is found
*/
- NetExecutable getNetExecutableFor( String vendor, String frameworkVersion, String profile, MavenProject project,
- List<String> commands, File netHome )
+ NetExecutable getNetExecutableFor( String vendor, String frameworkVersion, String profile, List<String> commands,
+ File netHome )
throws PlatformUnsupportedException;
/**
@@ -77,10 +77,13 @@
* @throws PlatformUnsupportedException if no executable is found
*/
NetExecutable getNetExecutableFromRepository( String groupId, String artifactId, VendorInfo vendorInfo,
- MavenProject project, String localRepository, List<String> commands,
+ File localRepository, List<String> commands,
boolean isIsolatedAppDomain )
throws PlatformUnsupportedException;
+ NetExecutable getJavaExecutableFromRepository( VendorInfo vendorInfo, List<String> commands )
+ throws PlatformUnsupportedException;
+
/**
* Returns an executable for compiling .NET applications.
*
@@ -103,15 +106,14 @@
* @param groupId the group ID of the executable artifact (as specified within the maven repo)
* @param artifactId the artifact ID of the executable artifact (as specified within the maven repo)
* @param vendorInfo the additional vendor information used to decide how to execute the net executable
- * @param project the maven project
* @param localRepository the local maven repository where the executable resides.
* @param parameterFile the file containing parameter information to inject into the .NET plugin
* @param mojoName the name of the .NET Mojo implementation
* @return the plugin loader for executing a .NET plugin
* @throws PlatformUnsupportedException if no executable is found
*/
- NetExecutable getPluginLoaderFor( String groupId, String artifactId, VendorInfo vendorInfo, MavenProject project,
- String localRepository, File parameterFile, String mojoName )
+ NetExecutable getPluginLoaderFor( String groupId, String artifactId, VendorInfo vendorInfo, String localRepository,
+ File parameterFile, String mojoName )
throws PlatformUnsupportedException;
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Sun May 13 16:05:48 2007
@@ -152,8 +152,7 @@
if ( artifact != null )
{
AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
- File artifactPath = new File( compilerConfig.getLocalRepository().getAbsolutePath() + File.separator +
- layout.pathOf( artifact ) );
+ File artifactPath = new File( compilerConfig.getLocalRepository(), layout.pathOf( artifact ) );
executionPaths.add( artifactPath.getParentFile().getAbsolutePath() );
}
}
@@ -169,12 +168,10 @@
}
/**
- * @see NetExecutableFactory#getPluginLoaderFor(String, String, org.apache.maven.dotnet.vendor.VendorInfo,
- * org.apache.maven.project.MavenProject, String, java.io.File, String)
+ * @see NetExecutableFactory#getPluginLoaderFor(String,String,org.apache.maven.dotnet.vendor.VendorInfo,String,java.io.File,String)
*/
public NetExecutable getPluginLoaderFor( String groupId, String artifactId, VendorInfo vendorInfo,
- MavenProject project, String localRepository, File parameterFile,
- String mojoName )
+ String localRepository, File parameterFile, String mojoName )
throws PlatformUnsupportedException
{
List<Artifact> artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null );
@@ -204,17 +201,16 @@
artifactPath = new File( localRepository + File.separator + layout.pathOf( pluginLoaderArtifact ) );
commands.add( "startProcessAssembly=" + artifactPath.getAbsolutePath() );
- return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, project,
- localRepository, commands, false );
+ return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo,
+ new File( localRepository ), commands, false );
}
/**
- * @see NetExecutableFactory#getNetExecutableFromRepository(String, String, org.apache.maven.dotnet.vendor.VendorInfo,
- * org.apache.maven.project.MavenProject, String, java.util.List<String>, boolean)
+ * @see NetExecutableFactory#getNetExecutableFromRepository(String, String, org.apache.maven.dotnet.vendor.VendorInfo, String, java.util.List<java.lang.String>, boolean)
*/
public NetExecutable getNetExecutableFromRepository( String groupId, String artifactId, VendorInfo vendorInfo,
- MavenProject project, String localRepository,
- List<String> commands, boolean isIsolatedAppDomain )
+ File localRepository, List<String> commands,
+ boolean isIsolatedAppDomain )
throws PlatformUnsupportedException
{
if ( isIsolatedAppDomain )
@@ -243,8 +239,8 @@
0 ) ) ).getAbsolutePath();
commands.add( "pluginArtifactPath=" + pluginArtifactPath );
- return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, project,
- localRepository, commands, false );
+ return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, localRepository,
+ commands, false );
}
if ( commands == null )
@@ -269,8 +265,9 @@
List<Artifact> artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null );
if ( artifacts.size() == 0 )
{
- throw new PlatformUnsupportedException( "NMAVEN-066-022: Could not locate the executable: GroupId = " +
- groupId + ", ArtifactId = " + artifactId );
+ throw new PlatformUnsupportedException(
+ "NMAVEN-066-022: Could not locate the executable- missing entry in the net-dependencies.xml: GroupId = " +
+ groupId + ", ArtifactId = " + artifactId );
}
Artifact artifact = artifacts.get( 0 );
@@ -336,14 +333,87 @@
{
throw new PlatformUnsupportedException( "NMAVEN-066-004: Unable to find net executable", e );
}
+ }
+
+ public NetExecutable getJavaExecutableFromRepository( VendorInfo vendorInfo, List<String> commands )
+ throws PlatformUnsupportedException
+ {
+
+ if ( commands == null )
+ {
+ commands = new ArrayList<String>();
+ }
+
+ try
+ {
+ processor.process( vendorInfo );
+ }
+ catch ( IllegalStateException e )
+ {
+ throw new PlatformUnsupportedException( "NMAVEN-066-010: Illegal State: Vendor Info = " + vendorInfo, e );
+ }
+
+ if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ||
+ vendorInfo.getVendorVersion() == null )
+ {
+ throw new PlatformUnsupportedException( "NMAVEN-066-018: Missing Vendor Information: " + vendorInfo );
+ }
+
+ ExecutableRequirement executableRequirement =
+ ExecutableRequirement.Factory.createDefaultExecutableRequirement();
+ executableRequirement.setVendor( vendorInfo.getVendor() );
+ executableRequirement.setFrameworkVersion( vendorInfo.getFrameworkVersion() );
+ executableRequirement.setVendorVersion( vendorInfo.getVendorVersion() );
+ executableRequirement.setProfile( "dotnet-jetty:start" );
+
+ ExecutableConfig executableConfig = ExecutableConfig.Factory.createDefaultExecutableConfig();
+ executableConfig.setCommands( commands );
+ // List<String> executablePaths = ( executableConfig.getExecutionPaths() == null ) ? new ArrayList<String>()
+ // : executableConfig.getExecutionPaths();
+
+ executableConfig.setExecutionPaths( new ArrayList<String>() );
+ executableContext.init( executableRequirement, executableConfig, capabilityMatcher );
+
+ try
+ {
+ return executableContext.getNetExecutable();
+ }
+ catch ( ExecutionException e )
+ {
+ throw new PlatformUnsupportedException( "NMAVEN-066-001: Unable to find net executable", e );
+ }
+/*
+ ExecutableConfig executableConfig = ExecutableConfig.Factory.createDefaultExecutableConfig();
+ executableConfig.setExecutionPaths( Arrays.asList( "java" ) );
+ executableConfig.setCommands( commands );
+
+ try
+ {
+ repositoryExecutableContext.init( executableConfig );
+ }
+ catch ( InitializationException e )
+ {
+ throw new PlatformUnsupportedException(
+ "NMAVEN-066-006: Unable to initialize the repository executable context", e );
+ }
+
+ try
+ {
+ return repositoryExecutableContext.getNetExecutable();
+ }
+ catch ( ExecutionException e )
+ {
+ throw new PlatformUnsupportedException( "NMAVEN-066-004: Unable to find net executable", e );
+ }
+ */
}
/**
* @see NetExecutableFactory
*/
public NetExecutable getNetExecutableFor( String vendor, String frameworkVersion, String profile,
- MavenProject project, List<String> commands, File netHome )
+ List<String> commands, File netHome )
throws PlatformUnsupportedException
{
Added: incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/pom.xml?view=auto&rev=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/pom.xml (added)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/pom.xml Sun May 13 16:05:48 2007
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <version>0.14-SNAPSHOT</version>
+ <artifactId>dotnet-components</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-jetty</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ <name>dotnet-jetty</name>
+ <description>
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-embedded</artifactId>
+ <version>6.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-artifact</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java?view=auto&rev=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java (added)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java Sun May 13 16:05:48 2007
@@ -0,0 +1,44 @@
+package org.apache.maven.dotnet.jetty;
+
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.handler.HandlerCollection;
+import org.mortbay.jetty.handler.DefaultHandler;
+import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.thread.BoundedThreadPool;
+
+public class JettyStarter
+{
+
+ public static void main( String[] args )
+ {
+ String port = System.getProperty( "port" );
+ Server server = new Server( Integer.parseInt( port ) );
+ WebAppContext context = new WebAppContext();
+ context.setWar(System.getProperty( "warFile" ));
+ //
+ context.setServer( server );
+ context.setContextPath( "/dotnet-service-embedder" );
+ HandlerCollection handlers = new HandlerCollection();
+ handlers.setHandlers( new Handler[]{context, new DefaultHandler()} );
+ server.setHandler( handlers );
+ BoundedThreadPool pool = new BoundedThreadPool();
+ server.setThreadPool( pool );
+ try
+ {
+ server.start();
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ }
+ try
+ {
+ server.join();
+ }
+ catch ( InterruptedException e )
+ {
+ e.printStackTrace();
+ }
+ }
+}
Propchange: incubator/nmaven/branches/SI_XPT/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java Sun May 13 16:05:48 2007
@@ -131,7 +131,7 @@
vendorInfo.setFrameworkVersion( getFrameworkVersion() );
vendorInfo.setVendorVersion( getVendorVersion() );
getNetExecutableFactory().getPluginLoaderFor( getMojoGroupId(), getMojoArtifactId(), vendorInfo,
- getMavenProject(), getLocalRepository(), paramFile,
+ getLocalRepository(), paramFile,
getClassName() ).execute();
}
catch ( PlatformUnsupportedException e )
Modified: incubator/nmaven/branches/SI_XPT/components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/pom.xml?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/pom.xml Sun May 13 16:05:48 2007
@@ -144,6 +144,7 @@
<module>dotnet-assembler</module>
<module>dotnet-embedder</module>
<module>dotnet-executable</module>
+ <module>dotnet-jetty</module>
<module>dotnet-plugin</module>
<module>dotnet-registry</module>
<module>dotnet-service/embedder</module>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/GacInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/GacInstallerMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/GacInstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/GacInstallerMojo.java Sun May 13 16:05:48 2007
@@ -69,7 +69,7 @@
try
{
NetExecutable netExecutable = netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile,
- project, getCommands(), null );
+ getCommands(), null );
netExecutable.execute();
getLog().info( "NMAVEN-xxx-003: Installed Assembly into GAC: Assembly = " +
project.getArtifact().getFile() + ", Vendor = " + netExecutable.getVendor().getVendorName() );
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/LinkerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/LinkerMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/LinkerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/src/main/java/org/apache/maven/dotnet/plugin/link/LinkerMojo.java Sun May 13 16:05:48 2007
@@ -77,7 +77,7 @@
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, project, getCommands(),
+ netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
null ).execute();
}
catch ( ExecutionException e )
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java Sun May 13 16:05:48 2007
@@ -47,7 +47,7 @@
/**
* @parameter expression="${settings.localRepository}"
*/
- private String localRepository;
+ private File localRepository;
/**
* The maven project.
@@ -106,7 +106,7 @@
commands.add( "artifactId=" + project.getArtifactId() );
commands.add( "artifactVersion=" + project.getVersion());
netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugins", "NMaven.Plugin.MojoGenerator",
- vendorInfo, project, localRepository, commands,
+ vendorInfo, localRepository, commands,
true ).execute();
}
catch ( PlatformUnsupportedException e )
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Sun May 13 16:05:48 2007
@@ -47,7 +47,7 @@
/**
* @parameter expression="${settings.localRepository}"
*/
- private String localRepository;
+ private File localRepository;
/**
* The maven project.
@@ -106,23 +106,22 @@
return;
}
- if(localRepository == null)
+ if ( localRepository == null )
{
- localRepository = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
- }
+ localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" );
+ }
/*
- * We should do this check at a lower level (to keep consistent behavior with the nmaven-settings.xml)
- * but we do not currently support the execution of specific plugins based on vendor info.
- */
- if(vendor != null && vendor.equals( "DotGNU"))
+ * We should do this check at a lower level (to keep consistent behavior with the nmaven-settings.xml)
+ * but we do not currently support the execution of specific plugins based on vendor info.
+ */
+ if ( vendor != null && vendor.equals( "DotGNU" ) )
{
- getLog().info("NMAVEN-1501-005: Unsupported Plugin" );
+ getLog().info( "NMAVEN-1501-005: Unsupported Plugin" );
return;
}
- File sourceDirectory = new File(
- project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator + "resgen" );
+ File sourceDirectory = new File( project.getBuild().getDirectory(), "/assembly-resources/resgen" );
if ( !sourceDirectory.exists() )
{
return;
@@ -153,7 +152,7 @@
vendorInfo.setFrameworkVersion( frameworkVersion );
vendorInfo.setVendorVersion( vendorVersion );
netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugins", "NMaven.Plugin.Resx", vendorInfo,
- project, localRepository, commands, false ).execute();
+ localRepository, commands, false ).execute();
}
catch ( PlatformUnsupportedException e )
{
@@ -170,7 +169,7 @@
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, "RESGEN", project, getCommands(),
+ netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, "RESGEN", getCommands(),
netHome ).execute();
}
catch ( ExecutionException e )
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java Sun May 13 16:05:48 2007
@@ -193,7 +193,7 @@
try
{
NetExecutable netExecutable = netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion,
- "GACUTIL", project,
+ "GACUTIL",
getGacInstallCommandsFor(
artifacts.get( 0 ) ),
null );
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XmlToXsdGeneratorMojo.java Sun May 13 16:05:48 2007
@@ -117,7 +117,7 @@
FileUtils.mkdir( outputDirectory );
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, project, getCommands(),
+ netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
netHome ).execute();
}
catch ( ExecutionException e )
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-xsd-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsd/XsdGeneratorMojo.java Sun May 13 16:05:48 2007
@@ -178,7 +178,7 @@
FileUtils.mkdir( outputDirectory );
try
{
- netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, project, getCommands(),
+ netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(),
netHome ).execute();
}
catch ( ExecutionException e )
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStarterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStarterMojo.java?view=diff&rev=537675&r1=537674&r2=537675
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStarterMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-xsp-plugin/src/main/java/org/apache/maven/dotnet/plugin/xsp/XspStarterMojo.java Sun May 13 16:05:48 2007
@@ -74,7 +74,7 @@
{
Runnable executable = (Runnable) netExecutableFactory.getNetExecutableFor( Vendor.MONO.getVendorName(),
frameworkVersion, "XSP:START",
- project, new ArrayList<String>(),
+ new ArrayList<String>(),
netHome );
Thread thread = new Thread( executable );
getPluginContext().put( "xspThread", thread);