svn commit: r1529645 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java

2013-10-06 Thread bodewig 
Author: bodewig
Date: Sun Oct  6 16:55:44 2013
New Revision: 1529645

URL: http://svn.apache.org/r1529645
Log:
DOS time for ZIP/ARJ never stores milliseconds (it is at two second granularity)

Modified:

commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java?rev=1529645r1=1529644r2=1529645view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
 Sun Oct  6 16:55:44 2013
@@ -200,6 +200,7 @@ public abstract class ZipUtil {
 cal.set(Calendar.HOUR_OF_DAY, (int) (dosTime  11)  0x1f);
 cal.set(Calendar.MINUTE, (int) (dosTime  5)  0x3f);
 cal.set(Calendar.SECOND, (int) (dosTime  1)  0x3e);
+cal.set(Calendar.MILLISECOND, 0);
 // CheckStyle:MagicNumberCheck ON
 return cal.getTime().getTime();
 }

svn commit: r1529665 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java

2013-10-06 Thread bodewig 
Author: bodewig
Date: Sun Oct  6 18:46:45 2013
New Revision: 1529665

URL: http://svn.apache.org/r1529665
Log:
arj stores date in seconds since epoch on Unix

Modified:

commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java?rev=1529665r1=1529664r2=1529665view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveEntry.java
 Sun Oct  6 18:46:45 2013
@@ -58,8 +58,9 @@ public class ArjArchiveEntry implements 
 }
 
 public Date getLastModifiedDate() {
-return new Date(ZipUtil.dosToJavaTime(
-0xL  localFileHeader.dateTimeModified));
+long ts = isHostOsUnix() ? (localFileHeader.dateTimeModified * 1000l)
+: ZipUtil.dosToJavaTime(0xL  
localFileHeader.dateTimeModified);
+return new Date(ts);
 }
 
 /**
@@ -77,7 +78,7 @@ public class ArjArchiveEntry implements 
  * pWill only be non-zero of the host os was UNIX.
  */
 public int getUnixMode() {
-return getHostOs() == HostOs.UNIX ? getMode() : 0;
+return isHostOsUnix() ? getMode() : 0;
 }
 
 /**
@@ -89,6 +90,14 @@ public class ArjArchiveEntry implements 
 }
 
 /**
+ * Is the operating system the archive has been created on one
+ * that is considered a UNIX OS by arj?
+ */
+public boolean isHostOsUnix() {
+return getHostOs() == HostOs.UNIX || getHostOs() == HostOs.NEXT;
+}
+
+/**
  * The known values for HostOs.
  */
 public static class HostOs {

svn commit: r1529670 - /commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/PluginRepository.java

2013-10-06 Thread jlmonteiro 
Author: jlmonteiro
Date: Sun Oct  6 19:47:22 2013
New Revision: 1529670

URL: http://svn.apache.org/r1529670
Log:
Adding a constant for the activation flag.

Modified:

commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/PluginRepository.java

Modified: 
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/PluginRepository.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/PluginRepository.java?rev=1529670r1=1529669r2=1529670view=diff
==
--- 
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/PluginRepository.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/PluginRepository.java
 Sun Oct  6 19:47:22 2013
@@ -29,13 +29,18 @@ import java.util.regex.Pattern;
 public final class PluginRepository {
 public static CollectionPluginInfo PLUGIN_INFO = new 
CopyOnWriteArrayListPluginInfo();
 
+/** This flag is used to activate a plugin by its name [plugin.name]. The 
default value is true which means that
+ * every plugin discovered will be used.
+ */
+public static final String ACTIVATED_FLAG = .activated;
+
 static {
 for (final Plugin plugin : ServiceLoader.load(Plugin.class, 
Plugin.class.getClassLoader())) {
 final String name = plugin.name();
 if (name == null) {
 throw new IllegalArgumentException(plugin name can't be 
null);
 }
-if (!Configuration.is(name + .activated, true)) {
+if (!Configuration.is(name + ACTIVATED_FLAG, true)) {
 continue;
 }

svn commit: r881476 - in /websites/production/commons/content/proper/commons-compress: ./ apidocs/ apidocs/org/apache/commons/compress/archivers/ apidocs/org/apache/commons/compress/archivers/ar/ apid

2013-10-06 Thread bodewig 
Author: bodewig
Date: Sun Oct  6 19:57:46 2013
New Revision: 881476

Log:
update compress site


[This commit notification would consist of 118 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1529673 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/cpio/ main/java/org/apache/commons/compress/archivers/tar/ test/java/org/apache/commons/co

2013-10-06 Thread bodewig 
Author: bodewig
Date: Sun Oct  6 20:03:08 2013
New Revision: 1529673

URL: http://svn.apache.org/r1529673
Log:
backwards incompatible changes

Modified:

commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java

commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java

commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=1529673r1=1529672r2=1529673view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
 Sun Oct  6 20:03:08 2013
@@ -484,7 +484,7 @@ public class CpioArchiveInputStream exte
 }
 
 @Override
-public CpioArchiveEntry getNextEntry() throws IOException {
+public ArchiveEntry getNextEntry() throws IOException {
 return getNextCPIOEntry();
 }
 

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=1529673r1=1529672r2=1529673view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
 Sun Oct  6 20:03:08 2013
@@ -606,7 +606,7 @@ public class TarArchiveInputStream exten
  * 
  * @return The current Archive Entry
  */
-public ArchiveEntry getCurrentEntry() {
+public TarArchiveEntry getCurrentEntry() {
 return currEntry;
 }
 

Modified: 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java?rev=1529673r1=1529672r2=1529673view=diff
==
--- 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
 (original)
+++ 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
 Sun Oct  6 20:03:08 2013
@@ -35,7 +35,7 @@ public class CpioArchiveInputStreamTest 
 CpioArchiveEntry entry;
 
 StringBuilder result = new StringBuilder();
-while ((entry = in.getNextEntry()) != null) {
+while ((entry = (CpioArchiveEntry) in.getNextEntry()) != null) {
 result.append(entry.getName());
 int tmp;
 while ((tmp = in.read()) != -1) {

svn commit: r1529672 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java

2013-10-06 Thread bodewig 
Author: bodewig
Date: Sun Oct  6 20:02:43 2013
New Revision: 1529672

URL: http://svn.apache.org/r1529672
Log:
avoid NullPointerExceptions if Date is null

Modified:

commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java?rev=1529672r1=1529671r2=1529672view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
 Sun Oct  6 20:02:43 2013
@@ -113,7 +113,9 @@ public class SevenZArchiveEntry implemen
 
 public void setCreationDate(Date creationDate) {
 hasCreationDate = creationDate != null;
-this.creationDate = javaTimeToNtfsTime(creationDate);
+if (hasCreationDate) {
+this.creationDate = javaTimeToNtfsTime(creationDate);
+}
 }
 
 public boolean getHasLastModifiedDate() {
@@ -139,7 +141,9 @@ public class SevenZArchiveEntry implemen
 
 public void setLastModifiedDate(Date lastModifiedDate) {
 hasLastModifiedDate = lastModifiedDate != null;
-this.lastModifiedDate = javaTimeToNtfsTime(lastModifiedDate);
+if (hasLastModifiedDate) {
+this.lastModifiedDate = javaTimeToNtfsTime(lastModifiedDate);
+}
 }
 
 public boolean getHasAccessDate() {
@@ -165,7 +169,9 @@ public class SevenZArchiveEntry implemen
 
 public void setAccessDate(Date accessDate) {
 hasAccessDate = accessDate != null;
-this.accessDate = javaTimeToNtfsTime(accessDate);
+if (hasAccessDate) {
+this.accessDate = javaTimeToNtfsTime(accessDate);
+}
 }
 
 public boolean getHasWindowsAttributes() {