Author: sagara
Date: Sun Dec 4 09:17:05 2011
New Revision: 1210084
URL: http://svn.apache.org/viewvc?rev=1210084&view=rev
Log:
Merged r1210082 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 4 09:17:05 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1210082
Modified:
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1210084&r1=1210083&r2=1210084&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
Sun Dec 4 09:17:05 2011
@@ -24,6 +24,8 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
@@ -240,16 +242,29 @@ public abstract class AbstractAarMojo
* TO DO: Remove this method when
Maven moves to
* plexus-utils version 1.4
*/
- private void copyFileIfModified(File source, File destination)
- throws IOException {
- // TO DO: Remove this method and use the method in WarFileUtils when
Maven 2 changes
- // to plexus-utils 1.2.
- if (destination.lastModified() < source.lastModified()) {
- FileUtils.copyFile(source.getCanonicalFile(), destination);
- // preserve timestamp
- destination.setLastModified(source.lastModified());
- }
- }
+ private void copyFileIfModified(File source, File destination)
+ throws IOException {
+ // TO DO: Remove this method and use the method in WarFileUtils
when
+ // Maven 2 changes
+ // to plexus-utils 1.2.
+ if (destination.lastModified() < source.lastModified()) {
+ if (source.isDirectory()) {
+ JarArchiver jarArchiver = new JarArchiver();
+ try {
+ jarArchiver.setDestFile(destination);
+
jarArchiver.addDirectory(source.getCanonicalFile());
+ jarArchiver.createArchive();
+ } catch (ArchiverException e) {
+ // wrap ArchiverException in IOException
+ throw new IOException(e);
+ }
+ } else {
+ FileUtils.copyFile(source.getCanonicalFile(),
destination);
+ // preserve timestamp
+
destination.setLastModified(source.lastModified());
+ }
+ }
+ }
private void copyFileSet(FileSet fileSet, File targetDirectory)
throws IOException {
