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/13 16:54:14 UTC
svn commit: r774387 - in /labs/magma/trunk/maven-magma-plugin: ./
src/main/java/org/apache/magma/tools/maven/
Author: simoneg
Date: Wed May 13 14:54:13 2009
New Revision: 774387
URL: http://svn.apache.org/viewvc?rev=774387&view=rev
Log:
Revert to previous maven version, will need to spot where the problem resides
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestAgent.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestMojo.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.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=774387&r1=774386&r2=774387&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Wed May 13 14:54:13 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-rev11</version>
+ <version>0.0.3-rev12</version>
<description>
Provides mojos to compile and test a magma package.
</description>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.4.2</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestAgent.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestAgent.java?rev=774387&r1=774386&r2=774387&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestAgent.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaTestAgent.java Wed May 13 14:54:13 2009
@@ -31,12 +31,14 @@
public static void premain(String args, Instrumentation instr) {
// Register openjpa transformer if present
+ System.out.println("Starting Magma Test Agent");
Class cftclass = null;
try {
cftclass = Class.forName("org.apache.magma.database.openjpa.SupportTransformer");
} catch (ClassNotFoundException e) {
}
if (cftclass != null) {
+ System.out.println("Installing OpenJPA class transformer");
try {
InputStream ress = cftclass.getResourceAsStream("/magma-test-classpath.txt");
if (ress == null) {
@@ -65,6 +67,8 @@
} catch (Throwable t) {
t.printStackTrace();
}
+ } else {
+ System.out.println("No transformer to install");
}
}
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=774387&r1=774386&r2=774387&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 Wed May 13 14:54:13 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-rev11"));
+ art = artifactFactory.createPluginArtifact("org.apache.magma.tools", "maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev12"));
artifactResolver.resolve(art, project.getPluginArtifactRepositories(), localRepository);
if (art.getFile() == null) throw new ArtifactResolutionException("Cannot find file", art);
} catch (ArtifactResolutionException e) {
Modified: labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java?rev=774387&r1=774386&r2=774387&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java (original)
+++ labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaWarPackaged.java Wed May 13 14:54:13 2009
@@ -37,7 +37,7 @@
archiver.getArchiver().addDirectory(webappDirectory);
MavenArchiveConfiguration conf = new MavenArchiveConfiguration();
archiver.createArchive(project, conf);
- projectHelper.attachArtifact(project, "war", warName);
+ projectHelper.attachArtifact(project, "war", null, warName);
} catch (Exception e) {
throw new RuntimeException("Error creating WAR file " + warName.getAbsolutePath(), e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org