You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/05/07 03:52:21 UTC
svn commit: r772485 - in /labs/magma/trunk/maven-magma-plugin: ./
src/main/java/org/apache/magma/tools/maven/
Author: simoneg
Date: Thu May 7 01:52:20 2009
New Revision: 772485
URL: http://svn.apache.org/viewvc?rev=772485&view=rev
Log:
LABS-210 : enhancements to maven mojo to support selenium tests
Added:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyStop.java
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
Modified: labs/magma/trunk/maven-magma-plugin/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/pom.xml?rev=772485&r1=772484&r2=772485&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Thu May 7 01:52:20 2009
@@ -24,7 +24,7 @@
<groupId>org.apache.magma.tools</groupId>
<artifactId>maven-magma-plugin</artifactId>
<name>Magma Extension Mojo</name>
- <version>0.0.3-rev07</version>
+ <version>0.0.3-rev08</version>
<description>
Provides mojos to compile and test a magma package.
</description>
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java?rev=772485&r1=772484&r2=772485&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java Thu May 7 01:52:20 2009
@@ -58,6 +58,8 @@
*/
public class MagmaJettyRun extends AbstractMojo {
+ protected static Server server;
+
/**
* The maven project.
*
@@ -77,6 +79,16 @@
private String contextPath;
/**
+ * The context path for the webapp. Defaults to the name of the webapp's
+ * artifact.
+ *
+ * @parameter expression="false"
+ * @required
+ */
+ private boolean background = false;
+
+
+ /**
* The temporary directory to use for the webapp. Defaults to
* target/work
*
@@ -102,7 +114,7 @@
@SuppressWarnings("unchecked")
public void execute() throws MojoExecutionException, MojoFailureException {
System.setProperty("magma.env", System.getProperty("magma.env", "devel"));
- Server server = new Server();
+ server = new Server();
server.setStopAtShutdown(true);
//make sure Jetty does not use URLConnection caches with the plugin
Resource.setDefaultUseCaches(false);
@@ -126,7 +138,10 @@
List resources = project.getResources();
for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
org.apache.maven.model.Resource res = (org.apache.maven.model.Resource) iterator.next();
- urls.add(new File(res.getDirectory()).toURI().toURL());
+ File resdir = new File(res.getDirectory());
+ if (resdir.exists()) {
+ urls.add(resdir.toURI().toURL());
+ }
}
urls.add(this.classesDirectory.toURI().toURL());
@@ -203,7 +218,10 @@
root.setChainProvider(ajcprovider);
ajcprovider.setChainProvider(rootprovider);
- Class support = root.loadClass("org.apache.magma.database.openjpa.SupportTransformer");
+ Class support = null;
+ try {
+ support = root.loadClass("org.apache.magma.database.openjpa.SupportTransformer");
+ } catch (ClassNotFoundException e) {}
if (support != null) {
StringBuilder paths = new StringBuilder();
for (URL acurl : urlarray) {
@@ -243,7 +261,7 @@
try {
server.start();
- server.join();
+ if (!background) server.join();
} catch (Exception e) {
throw new MojoExecutionException("Error starting server", e);
}
Added: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyStop.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyStop.java?rev=772485&view=auto
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyStop.java (added)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyStop.java Thu May 7 01:52:20 2009
@@ -0,0 +1,25 @@
+package org.apache.magma.tools.maven;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
+/**
+ * @goal stop
+ * @requiresDependencyResolution runtime
+ * @description Stops the jetty server started by magma:run
+ */
+public class MagmaJettyStop extends MagmaJettyRun {
+
+ @Override
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ try {
+ server.stop();
+ server.join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java?rev=772485&r1=772484&r2=772485&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java Thu May 7 01:52:20 2009
@@ -867,7 +867,7 @@
}
*/
//art = (Artifact) project.getPluginArtifactMap().get(ArtifactUtils.versionlessKey( "org.apache.magma.tools", "maven-magma-plugin"));
- art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev07"));
+ art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev08"));
artifactResolver.resolve(art, project.getPluginArtifactRepositories(), localRepository);
if (art.getFile() == null) throw new ArtifactResolutionException("Cannot find file", art);
} catch (ArtifactResolutionException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org