Author: simoneg
Date: Sun Aug 16 19:21:55 2009
New Revision: 804747
URL: http://svn.apache.org/viewvc?rev=804747&view=rev
Log:
LABS-413 : fix addition of pom (or any other non jar) artifact to OpenJPA test
instrumentation path
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
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=804747&r1=804746&r2=804747&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Sun Aug 16 19:21:55 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-rev15</version>
+ <version>0.0.3-rev16</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/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=804747&r1=804746&r2=804747&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
Sun Aug 16 19:21:55 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-rev15"));
+ art =
artifactFactory.createPluginArtifact("org.apache.magma.tools",
"maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev16"));
artifactResolver.resolve(art,
project.getPluginArtifactRepositories(), localRepository);
if (art.getFile() == null) throw new
ArtifactResolutionException("Cannot find file", art);
} catch (ArtifactResolutionException e) {
@@ -884,8 +884,10 @@
for (Iterator iterator =
projectArtifactMap.values().iterator(); iterator
.hasNext();) {
Artifact artifact = (Artifact)
iterator.next();
-
fw.write(artifact.getFile().toURI().toURL().toExternalForm());
- fw.write(";");
+ if
(artifact.getType().equals("jar")) {
+
fw.write(artifact.getFile().toURI().toURL().toExternalForm());
+ fw.write(";");
+ }
}
fw.write(this.classesDirectory.toURI().toURL().toExternalForm());
fw.write(";");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
