Author: simoneg
Date: Mon Oct 19 14:41:52 2009
New Revision: 826691
URL: http://svn.apache.org/viewvc?rev=826691&view=rev
Log:
Fix signed jar problem on magma:war
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=826691&r1=826690&r2=826691&view=diff
==============================================================================
--- labs/magma/trunk/maven-magma-plugin/pom.xml (original)
+++ labs/magma/trunk/maven-magma-plugin/pom.xml Mon Oct 19 14:41:52 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-rev17</version>
+ <version>0.0.3-rev18</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=826691&r1=826690&r2=826691&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 Oct 19 14:41:52 2009
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.net.MalformedURLException;
@@ -140,6 +141,30 @@
jpaEnhance(launcher.aspectpath, art, outdir);
File destjar = new File(destjarfolder, fname +
".jar");
try {
+ // Check for signatures, and eventually
remove them
+ File metainf = new File(outdir,
"META-INF");
+ File[] sff = metainf.listFiles(new
FilenameFilter() {
+ public boolean accept(File dir,
String name) {
+ return
name.toUpperCase().endsWith(".SF");
+ }
+ });
+ if (sff.length > 0) {
+ getLog().warn("Artifact " +
art.getArtifactId() + " was signed, removing signatures on weaved jar");
+ for (final File file : sff) {
+ file.delete();
+ File[] sfdef =
metainf.listFiles(new FilenameFilter() {
+ public boolean
accept(File dir, String name) {
+ if
(name.indexOf('.') == -1) return false;
+ String
nne = name.substring(0, name.indexOf('.'));
+ return
file.getName().startsWith(nne + ".");
+ }
+ });
+ for (File sfd : sfdef) {
+ sfd.delete();
+ }
+ }
+ }
+
MavenArchiver archiver = new
MavenArchiver();
JarArchiver jarArchiver = (JarArchiver)
container.lookup("org.codehaus.plexus.archiver.Archiver","jar");
archiver.setArchiver(jarArchiver);
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=826691&r1=826690&r2=826691&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 Oct 19 14:41:52 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-rev17"));
+ art =
artifactFactory.createPluginArtifact("org.apache.magma.tools",
"maven-magma-plugin", VersionRange.createFromVersion("0.0.3-rev18"));
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]
