From: Mathieu Baudier Date: Fri, 5 Dec 2008 20:39:34 +0000 (+0000) Subject: Use local target dir X-Git-Tag: svn/tags/maven-plugins-0.3.0@2542~51 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c3cf987e3a5ed037595b0882fa39038dcaf64a26;p=gpl%2Fargeo-slc.git Use local target dir git-svn-id: https://svn.argeo.org/slc/trunk/maven@1885 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/plugins/maven-argeo-pde-plugin/.classpath b/plugins/maven-argeo-pde-plugin/.classpath new file mode 100644 index 000000000..03ebd9b46 --- /dev/null +++ b/plugins/maven-argeo-pde-plugin/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/maven-argeo-pde-plugin/.project b/plugins/maven-argeo-pde-plugin/.project index 7cafba57b..8ca530d04 100644 --- a/plugins/maven-argeo-pde-plugin/.project +++ b/plugins/maven-argeo-pde-plugin/.project @@ -5,7 +5,19 @@ + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature diff --git a/plugins/maven-argeo-pde-plugin/.settings/org.eclipse.jdt.core.prefs b/plugins/maven-argeo-pde-plugin/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..63f4cf16b --- /dev/null +++ b/plugins/maven-argeo-pde-plugin/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 05 10:50:53 CET 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/plugins/maven-argeo-pde-plugin/.settings/org.maven.ide.eclipse.prefs b/plugins/maven-argeo-pde-plugin/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..00c3a19bd --- /dev/null +++ b/plugins/maven-argeo-pde-plugin/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,8 @@ +#Fri Dec 05 10:50:52 CET 2008 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +version=1 diff --git a/plugins/maven-argeo-pde-plugin/pom.xml b/plugins/maven-argeo-pde-plugin/pom.xml index d2292466a..83117ef80 100644 --- a/plugins/maven-argeo-pde-plugin/pom.xml +++ b/plugins/maven-argeo-pde-plugin/pom.xml @@ -1,17 +1,34 @@ 4.0.0 - org.argeo.slc.maven.plugins + org.argeo.slc.maven.plugins + maven-argeo-pde-plugin - 0.1.2 + 0.3.1-SNAPSHOT maven-plugin Argeo PDE Plugin + + org.apache.maven + maven-plugin-api + 2.0 + org.apache.maven maven-script-ant 2.0.9 + + ant-contrib + ant-contrib + 1.0b2 + + + ant + ant + + + @@ -21,7 +38,8 @@ org.apache.maven - maven-plugin-tools-ant + maven-plugin-tools-ant + 2.1 @@ -31,19 +49,20 @@ - false argeo-restricted Argeo FOSS Repository - file:///var/argeo/maven2/argeo + file:///var/argeo/maven2/argeo + true argeo-snapshots-restricted Argeo FOSS Snapshots Repository - file:///var/argeo/maven2/argeo-snapshots + file:///var/argeo/maven2/argeo-snapshots + \ No newline at end of file diff --git a/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetForkMojo.java b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetForkMojo.java new file mode 100644 index 000000000..2edc8f6fa --- /dev/null +++ b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetForkMojo.java @@ -0,0 +1,16 @@ +package org.argeo.slc.maven.plugins.pde; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; + +/** + * Forks a eclipseTarget lifecycle. + * + * @goal eclipseTarget-fork + * @execute lifecycle="eclipseTarget" phase="initialize" + */ +public class EclipseTargetForkMojo extends AbstractMojo { + public void execute() throws MojoExecutionException { + getLog().info("doing nothing here"); + } +} diff --git a/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml b/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml new file mode 100644 index 000000000..c3429e936 --- /dev/null +++ b/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml @@ -0,0 +1,27 @@ + + + eclipseTarget + + + initialize + + + + org.apache.maven.plugins:maven-dependency-plugin:unpack-dependencies + + + + true + + + + + + eclipseTarget + + + + + + + diff --git a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml index ef44ee4f5..c2fe0b17e 100644 --- a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml +++ b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml @@ -1,55 +1,84 @@ - + + + - - + + + + + - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + - + - - - + + + + + + + - + + + + + + + + + + - - + + + + @@ -59,8 +88,7 @@ - + @@ -74,10 +102,10 @@ - - + + @@ -100,8 +128,7 @@ - + @@ -113,8 +140,7 @@ - + @@ -125,10 +151,10 @@ - - + + @@ -145,16 +171,64 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -166,12 +240,15 @@ - + + + @@ -183,11 +260,9 @@ - + - + - - + + @@ -219,11 +288,9 @@ - + - + diff --git a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml index 3eb0ad1ed..39e92bfe3 100644 --- a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml +++ b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml @@ -11,6 +11,7 @@ + eclipseAntArgs eclipseAntArgs @@ -36,11 +38,13 @@ elementId elementId true - ${project.artifactId} + ${project.artifactId} + java.lang.String The artifact id of the project by default, will - be used as element id. + be used + as element id. @@ -62,7 +66,8 @@ buildScriptProperties buildScriptProperties true - ${buildScriptProperties} + ${buildScriptProperties} + java.lang.String @@ -108,11 +113,13 @@ elementId elementId true - ${project.artifactId} + ${project.artifactId} + java.lang.String The artifact id of the project by default, will - be used as element id. + be used + as element id. @@ -143,14 +150,25 @@ elementId true true - ${project.artifactId} + ${project.artifactId} + java.lang.String The artifact id of the project by default, will - be used as element id. + be used + as element id. + + + eclipseTarget + eclipseTarget + + Installs an Eclipse target based on dependencies + + true + \ No newline at end of file