Author: lcorneliussen
Date: Fri May 4 09:33:37 2012
New Revision: 1333826
URL: http://svn.apache.org/viewvc?rev=1333826&view=rev
Log:
[NPANDAY-231] Remove RDF repository and model
o Put the netplugins back in service (at least settings generation works again)
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
incubator/npanday/trunk/components/dotnet-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/src/main/java/NPanday/Plugin/Addin/AutomationExtensibilityMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/src/main/java/NPanday/Plugin/Devenv/DevenvMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
(original)
+++
incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/NetExecutableFactoryImpl.java
Fri May 4 09:33:37 2012
@@ -235,6 +235,7 @@ public class NetExecutableFactoryImpl
);
commands.add( "startProcessAssembly=" +
pluginArtifact.getFile().getAbsolutePath() );
+
String pluginArtifactPath = findArtifact( artifacts,
"NPanday.Plugin").getFile().getAbsolutePath();
commands.add( "pluginArtifactPath=" + pluginArtifactPath );
@@ -382,42 +383,26 @@ public class NetExecutableFactoryImpl
{
Set<Artifact> dependencies = Sets.newHashSet(pluginArtifact);
- dependencies.add(
- artifactFactory.createDependencyArtifact(
- "org.apache.npanday", "NPanday.Model.Pom",
- VersionRange.createFromVersion( "1.5.0-incubating-SNAPSHOT" ),
- ArtifactType.DOTNET_LIBRARY.getPackagingType(), null, "runtime"
- )
+ Artifact loaderArtifact = artifactFactory.createDependencyArtifact(
+ "org.apache.npanday.plugins", "NPanday.Plugin.Loader",
+ VersionRange.createFromVersion( "1.5.0-incubating-SNAPSHOT" ),
+ ArtifactType.DOTNET_EXECUTABLE.getPackagingType(), null, "runtime"
);
-
dependencies.add(
- artifactFactory.createDependencyArtifact(
- "org.apache.npanday.plugins", "NPanday.Plugin",
- VersionRange.createFromVersion( "1.5.0-incubating-SNAPSHOT" ),
- ArtifactType.DOTNET_LIBRARY.getPackagingType(), null, "runtime"
- )
- );
-
- dependencies.add(
- artifactFactory.createDependencyArtifact(
- "org.apache.npanday.plugins", "NPanday.Plugin.Loader",
- VersionRange.createFromVersion( "1.5.0-incubating-SNAPSHOT" ),
- ArtifactType.DOTNET_LIBRARY.getPackagingType(), null, "runtime"
- )
+ pluginArtifact
);
// preresolve this one
artifactResolver.resolve( pluginArtifact,
project.getRemoteArtifactRepositories(), localRepository );
- File artifactPath = PathUtil.getPrivateApplicationBaseFileFor(
pluginArtifact, null, targetDir );
+ File pluginArtifactPath = PathUtil.getPrivateApplicationBaseFileFor(
pluginArtifact, null, targetDir );
List<String> commands = new ArrayList<String>();
commands.add( "parameterFile=" + parameterFile.getAbsolutePath() );
- commands.add( "assemblyFile=" + artifactPath.getAbsolutePath() );
+ commands.add( "assemblyFile=" + pluginArtifactPath.getAbsolutePath() );
commands.add( "mojoName=" + mojoName );//ArtifactId = namespace
- commands.add( "startProcessAssembly=" + artifactPath.getAbsolutePath()
);
return getPluginRunner(
- project, pluginArtifact, dependencies, vendorRequirement,
localRepository, commands, targetDir
+ project, loaderArtifact, dependencies, vendorRequirement,
localRepository, commands, targetDir
);
}
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
(original)
+++
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Fri May 4 09:33:37 2012
@@ -77,20 +77,6 @@ public abstract class AbstractMojo
container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY);
}
- /**
- * @component
- */
- private ArtifactResolver resolver;
-
- /**
- * @component
- */
- private ArtifactFactory artifactFactory;
-
- /**
- * @component
- */
- private ArtifactMetadataSource metadataSource;
/**
* Executes the mojo.
@@ -172,10 +158,10 @@ public abstract class AbstractMojo
{
ArtifactRepository localRepository = LocalRepositoryUtil.create(
getLocalRepository() );
- Artifact artifact = artifactFactory.createDependencyArtifact(
+ Artifact artifact = getArtifactFactory().createDependencyArtifact(
getMojoGroupId(),
getMojoArtifactId(),
- VersionRange.createFromVersion(project.getVersion()),
+ VersionRange.createFromVersion( "1.5.0-incubating-SNAPSHOT" ),
ArtifactType.DOTNET_MAVEN_PLUGIN.getPackagingType(),
null,
"runtime"
@@ -278,6 +264,8 @@ public abstract class AbstractMojo
public abstract String getFrameworkVersion();
+ public abstract ArtifactFactory getArtifactFactory();
+
/**
* Override this method for pre-execution commands.
*/
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
incubator/npanday/trunk/components/dotnet-plugin/src/main/resources/META-INF/plexus/components.xml
Fri May 4 09:33:37 2012
@@ -28,6 +28,9 @@
<requirement>
<role>npanday.plugin.PluginContext</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
</requirements>
</component>
<component>
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/src/main/java/NPanday/Plugin/Addin/AutomationExtensibilityMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/src/main/java/NPanday/Plugin/Addin/AutomationExtensibilityMojo.java?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/src/main/java/NPanday/Plugin/Addin/AutomationExtensibilityMojo.java
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Addin/javabinding/src/main/java/NPanday/Plugin/Addin/AutomationExtensibilityMojo.java
Fri May 4 09:33:37 2012
@@ -20,6 +20,7 @@ package NPanday.Plugin.Addin;
*/
import npanday.plugin.FieldAnnotation;
+import org.apache.maven.artifact.factory.ArtifactFactory;
/**
* @phase package
@@ -75,7 +76,12 @@ public class AutomationExtensibilityMojo
*/
private npanday.plugin.PluginContext pluginContext;
- public String getMojoArtifactId()
+ /**
+ * @component
+ */
+ private ArtifactFactory artifactFactory;
+
+ public String getMojoArtifactId()
{
return "NPanday.Plugin.Addin";
}
@@ -125,4 +131,8 @@ public class AutomationExtensibilityMojo
return frameworkVersion;
}
+ public ArtifactFactory getArtifactFactory()
+ {
+ return artifactFactory;
+ }
}
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/src/main/java/NPanday/Plugin/Devenv/DevenvMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/src/main/java/NPanday/Plugin/Devenv/DevenvMojo.java?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/src/main/java/NPanday/Plugin/Devenv/DevenvMojo.java
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Devenv/javabinding/src/main/java/NPanday/Plugin/Devenv/DevenvMojo.java
Fri May 4 09:33:37 2012
@@ -20,6 +20,7 @@ package NPanday.Plugin.Devenv;
*/
import npanday.plugin.FieldAnnotation;
+import org.apache.maven.artifact.factory.ArtifactFactory;
/**
* @phase deploy
@@ -75,7 +76,12 @@ public class DevenvMojo
*/
private npanday.plugin.PluginContext pluginContext;
- public String getMojoArtifactId()
+ /**
+ * @component
+ */
+ private ArtifactFactory artifactFactory;
+
+ public String getMojoArtifactId()
{
return "NPanday.Plugin.Devenv";
}
@@ -125,4 +131,8 @@ public class DevenvMojo
return frameworkVersion;
}
+ public ArtifactFactory getArtifactFactory()
+ {
+ return artifactFactory;
+ }
}
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=1333826&r1=1333825&r2=1333826&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 May 4 09:33:37 2012
@@ -28,6 +28,7 @@ import java.util.Map;
import npanday.plugin.FieldAnnotation;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -115,6 +116,11 @@ public class MsbuildMojo
*/
private boolean copyReferences = true;
+ /**
+ * @component
+ */
+ private ArtifactFactory artifactFactory;
+
public String getMojoArtifactId()
{
return "NPanday.Plugin.Msbuild";
@@ -234,4 +240,9 @@ public class MsbuildMojo
return super.preExecute();
}
+
+ public ArtifactFactory getArtifactFactory()
+ {
+ return artifactFactory;
+ }
}
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Settings/javabinding/src/main/java/NPanday/Plugin/Settings/SettingsGeneratorMojo.java
Fri May 4 09:33:37 2012
@@ -23,6 +23,7 @@ import npanday.PathUtil;
import npanday.plugin.FieldAnnotation;
import npanday.registry.RepositoryRegistry;
import npanday.vendor.SettingsUtil;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -97,6 +98,11 @@ public class SettingsGeneratorMojo
@FieldAnnotation()
public java.lang.String npandaySettingsPath;
+ /**
+ * @component
+ */
+ private ArtifactFactory artifactFactory;
+
public String getMojoArtifactId()
{
return "NPanday.Plugin.Settings";
@@ -264,4 +270,9 @@ public class SettingsGeneratorMojo
{
SettingsUtil.applyCustomSettings( getLog(), repositoryRegistry,
settingsPath);
}
+
+ public ArtifactFactory getArtifactFactory()
+ {
+ return artifactFactory;
+ }
}
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java?rev=1333826&r1=1333825&r2=1333826&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.SysRef/javabinding/src/main/java/NPanday/Plugin/SysRef/SysRefMojo.java
Fri May 4 09:33:37 2012
@@ -20,6 +20,7 @@
package NPanday.Plugin.SysRef;
import npanday.plugin.FieldAnnotation;
+import org.apache.maven.artifact.factory.ArtifactFactory;
/**
* @phase SysRef
@@ -75,7 +76,12 @@ public class SysRefMojo
*/
private npanday.plugin.PluginContext pluginContext;
- public String getMojoArtifactId()
+ /**
+ * @component
+ */
+ private ArtifactFactory artifactFactory;
+
+ public String getMojoArtifactId()
{
return "NPanday.Plugin.SysRef";
}
@@ -125,4 +131,8 @@ public class SysRefMojo
return frameworkVersion;
}
+ public ArtifactFactory getArtifactFactory()
+ {
+ return artifactFactory;
+ }
}
