Author: simoneg
Date: Mon Nov 15 23:56:54 2010
New Revision: 1035491
URL: http://svn.apache.org/viewvc?rev=1035491&view=rev
Log:
Checks for presence of OpenJPA before performing OpenJPA enhancement, cause now
there is also hibernate.
Modified:
labs/magma/trunk/maven-magma-plugin/pom.xml
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompleteCompileMojo.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=1035491&r1=1035490&r2=1035491&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Mon Nov 15 23:56:54 2010
@@ -24,7 +24,7 @@
<groupId>org.apache.magma.tools</groupId>
<artifactId>maven-magma-plugin</artifactId>
<name>Magma Extension Mojo</name>
- <version>0.0.3-rev22</version>
+ <version>0.0.3-rev23</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/MagmaAjcCompleteCompileMojo.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompleteCompileMojo.java?rev=1035491&r1=1035490&r2=1035491&view=diff
==============================================================================
---
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompleteCompileMojo.java
(original)
+++
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaAjcCompleteCompileMojo.java
Mon Nov 15 23:56:54 2010
@@ -77,6 +77,14 @@ public class MagmaAjcCompleteCompileMojo
* @required
*/
protected File destjarfolder;
+
+ /**
+ * Whether to run OpenJPA enhancement or not
+ *
+ * @parameter expression="${openjpa}"
+ */
+ protected Boolean useOpenJpa;
+
protected Collection getRelevantArtifacts() {
Collection artifacts = new
HashSet(project.getCompileArtifacts());
@@ -103,9 +111,24 @@ public class MagmaAjcCompleteCompileMojo
public void execute() throws MojoExecutionException,
MojoFailureException {
+ boolean hasOpenjpa = useOpenJpa != null && useOpenJpa;
+ if (useOpenJpa == null) {
+ getLog().info("Checking presence of OpenJPA");
+ for (Object artobj : project.getArtifacts()) {
+ Artifact art = (Artifact) artobj;
+ String groupId = art.getGroupId();
+ if (groupId.equals("org.apache.openjpa")) {
+ hasOpenjpa = true;
+ }
+ }
+ }
+
+
+
getLog().info("Weaving project classes");
super.execute();
- jpaEnhance(launcher.aspectpath, null, baseout);
+ if (hasOpenjpa)
+ jpaEnhance(launcher.aspectpath, null, baseout);
getLog().info("Weaving dependency JARs one by one");
@@ -138,7 +161,8 @@ public class MagmaAjcCompleteCompileMojo
throw new AjcCompilerException(errors);
}
- jpaEnhance(launcher.aspectpath, art, outdir);
+ if (hasOpenjpa)
+ jpaEnhance(launcher.aspectpath, art,
outdir);
File destjar = new File(destjarfolder, fname +
".jar");
try {
// Check for signatures, and eventually
remove them
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=1035491&r1=1035490&r2=1035491&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
Mon Nov 15 23:56:54 2010
@@ -867,7 +867,7 @@ public class MagmaTestMojo extends Abstr
}
*/
//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-rev22"));
+ art =
artifactFactory.createPluginArtifact("org.apache.magma.tools",
"maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev23"));
artifactResolver.resolve(art,
project.getPluginArtifactRepositories(), localRepository);
if (art.getFile() == null) throw new
ArtifactResolutionException("Cannot find file", art);
} catch (ArtifactResolutionException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
