svn commit: r1211779 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 08:05:51 2011
New Revision: 1211779

URL: http://svn.apache.org/viewvc?rev=1211779view=rev
Log:
minofr format, fixed checkstyle rules

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1211779r1=1211778r2=1211779view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 08:05:51 2011
@@ -1,3 +1,5 @@
+package org.apache.commons.digester3;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +17,6 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester3;
-
 import java.lang.reflect.Method;
 
 /**
@@ -26,19 +26,22 @@ import java.lang.reflect.Method;
  */
 public class RecordedInvocation
 {
-//**
-// Fields
-//**
+
+
//**
+// Fields
+
//**
 
 private final Method invokedMethod;
+
 private final Object[] arguments;
 
-  
//**
- // Constructors
- 
//**
+
//**
+// Constructors
+
//**
 
 /**
  * Create a new RecordedInvocation instance.
+ *
  * @param invokedMethod
  * @param arguments
  */
@@ -48,23 +51,27 @@ public class RecordedInvocation
 this.arguments = arguments;
 }
 
-  
//**
- // Canonical Methods
- 
//**
+
//**
+// Canonical Methods
+
//**
 
 /**
  * Get the invokedMethod.
+ *
  * @return Method
  */
-public Method getInvokedMethod() {
+public Method getInvokedMethod()
+{
 return invokedMethod;
 }
 
 /**
  * Get the arguments.
+ *
  * @return Object[]
  */
-public Object[] getArguments() {
+public Object[] getArguments()
+{
 return arguments;
 }
 
@@ -74,62 +81,64 @@ public class RecordedInvocation
 public String toString()
 {
 StringBuffer buffer = new StringBuffer();
-buffer.append(invokedMethod.getDeclaringClass().getName());
-buffer.append(.);
-buffer.append(invokedMethod.getName());
-buffer.append(();
+buffer.append( invokedMethod.getDeclaringClass().getName() );
+buffer.append( . );
+buffer.append( invokedMethod.getName() );
+buffer.append( ( );
 int count = arguments.length;
-for( int i = 0; i  count; i++ )
+for ( int i = 0; i  count; i++ )
 {
 Object arg = arguments[i];
-if( i  0 )
+if ( i  0 )
 {
-buffer.append(, );
+buffer.append( ,  );
 }
-convert(buffer, arg);
+convert( buffer, arg );
 }
-buffer.append());
+buffer.append( ) );
 return buffer.toString();
 }
 
 /**
  * Add a string representation of codeinput/code to 
codebuffer/code.
+ *
  * @param buffer
  * @param input
  */
 protected void convert( StringBuffer buffer, Object input )
 {
-if( input == null )
+if ( input == null )
 {
-buffer.append(null);
+

svn commit: r1211780 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 08:08:36 2011
New Revision: 1211780

URL: http://svn.apache.org/viewvc?rev=1211780view=rev
Log:
reduced RecordedInvocation class visibility, it can be hidden to final users

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1211780r1=1211779r2=1211780view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 08:08:36 2011
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
  * From Commons [proxy] v2 branch.
  * @author James Carman
  */
-public class RecordedInvocation
+final class RecordedInvocation
 {
 
 
//**

svn commit: r1211782 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 08:13:32 2011
New Revision: 1211782

URL: http://svn.apache.org/viewvc?rev=1211782view=rev
Log:
filled missing javadoc params

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1211782r1=1211781r2=1211782view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 08:13:32 2011
@@ -102,8 +102,8 @@ final class RecordedInvocation
 /**
  * Add a string representation of codeinput/code to 
codebuffer/code.
  *
- * @param buffer
- * @param input
+ * @param buffer the buffer to append the string representation of the 
input object.
+ * @param input the input object has to be serialized to string.
  */
 protected void convert( StringBuffer buffer, Object input )
 {

svn commit: r1211783 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 08:14:54 2011
New Revision: 1211783

URL: http://svn.apache.org/viewvc?rev=1211783view=rev
Log:
migrated StringBuffer to StringBuilder

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1211783r1=1211782r2=1211783view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 08:14:54 2011
@@ -80,7 +80,7 @@ final class RecordedInvocation
  */
 public String toString()
 {
-StringBuffer buffer = new StringBuffer();
+StringBuilder buffer = new StringBuilder();
 buffer.append( invokedMethod.getDeclaringClass().getName() );
 buffer.append( . );
 buffer.append( invokedMethod.getName() );
@@ -105,7 +105,7 @@ final class RecordedInvocation
  * @param buffer the buffer to append the string representation of the 
input object.
  * @param input the input object has to be serialized to string.
  */
-protected void convert( StringBuffer buffer, Object input )
+protected void convert( StringBuilder buffer, Object input )
 {
 if ( input == null )
 {

svn commit: r1211784 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 08:17:38 2011
New Revision: 1211784

URL: http://svn.apache.org/viewvc?rev=1211784view=rev
Log:
added missing @return javadoc parameter

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java?rev=1211784r1=1211783r2=1211784view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/DigesterLoader.java
 Thu Dec  8 08:17:38 2011
@@ -443,6 +443,7 @@ public final class DigesterLoader
  * Sets the document locator associated with our parser.
  *
  * @param locator the document locator associated with our parser.
+ * @return This loader instance, useful to chain methods.
  * @since 3.2
  */
 public DigesterLoader setDocumentLocator( Locator locator )

svn commit: r1211843 - /commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java

[damjan]

Author: damjan
Date: Thu Dec  8 11:41:55 2011
New Revision: 1211843

URL: http://svn.apache.org/viewvc?rev=1211843view=rev
Log:
Verify and fix the lengths of GPS EXIF tags,
based on the EXIF 2.2 specification.

This fixes part 2 of SANSELAN-51 and
some of part 3 of SANSELAN-31.

Jira issue key: SANSELAN-51 , SANSELAN-31


Modified:

commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java

Modified: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java?rev=1211843r1=1211842r2=1211843view=diff
==
--- 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java
 Thu Dec  8 11:41:55 2011
@@ -51,14 +51,14 @@ public interface GPSTagConstants
 
 // 
 public static final TagInfo GPS_TAG_GPS_ALTITUDE_REF = new TagInfo(
-GPS Altitude Ref, 0x0005, FIELD_TYPE_DESCRIPTION_BYTE, -1,
+GPS Altitude Ref, 0x0005, FIELD_TYPE_DESCRIPTION_BYTE, 1,
 EXIF_DIRECTORY_GPS);
 
 public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_ABOVE_SEA_LEVEL = 0;
 public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_BELOW_SEA_LEVEL = 1;
 // 
 public static final TagInfo GPS_TAG_GPS_ALTITUDE = new TagInfo(
-GPS Altitude, 0x0006, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
+GPS Altitude, 0x0006, FIELD_TYPE_DESCRIPTION_RATIONAL, 1,
 EXIF_DIRECTORY_GPS);
 
 // 
@@ -86,7 +86,7 @@ public interface GPSTagConstants
 public static final int 
GPS_TAG_GPS_MEASURE_MODE_VALUE_3_DIMENSIONAL_MEASUREMENT = 3;
 // 
 public static final TagInfo GPS_TAG_GPS_DOP = new TagInfo(GPS DOP,
-0x000b, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, EXIF_DIRECTORY_GPS);
+0x000b, FIELD_TYPE_DESCRIPTION_RATIONAL, 1, EXIF_DIRECTORY_GPS);
 
 // 
 public static final TagInfo GPS_TAG_GPS_SPEED_REF = new TagInfo(
@@ -98,7 +98,7 @@ public interface GPSTagConstants
 public static final String GPS_TAG_GPS_SPEED_REF_VALUE_KNOTS = N;
 // 
 public static final TagInfo GPS_TAG_GPS_SPEED = new TagInfo(GPS Speed,
-0x000d, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, EXIF_DIRECTORY_GPS);
+0x000d, FIELD_TYPE_DESCRIPTION_RATIONAL, 1, EXIF_DIRECTORY_GPS);
 
 // 
 public static final TagInfo GPS_TAG_GPS_TRACK_REF = new TagInfo(
@@ -109,7 +109,7 @@ public interface GPSTagConstants
 public static final String GPS_TAG_GPS_TRACK_REF_VALUE_TRUE_NORTH = T;
 // 
 public static final TagInfo GPS_TAG_GPS_TRACK = new TagInfo(GPS Track,
-0x000f, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, EXIF_DIRECTORY_GPS);
+0x000f, FIELD_TYPE_DESCRIPTION_RATIONAL, 1, EXIF_DIRECTORY_GPS);
 
 // 
 public static final TagInfo GPS_TAG_GPS_IMG_DIRECTION_REF = new TagInfo(
@@ -120,7 +120,7 @@ public interface GPSTagConstants
 public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH 
= T;
 // 
 public static final TagInfo GPS_TAG_GPS_IMG_DIRECTION = new TagInfo(
-GPS Img Direction, 0x0011, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
+GPS Img Direction, 0x0011, FIELD_TYPE_DESCRIPTION_RATIONAL, 1,
 EXIF_DIRECTORY_GPS);
 
 // 
@@ -161,7 +161,7 @@ public interface GPSTagConstants
 public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_TRUE_NORTH = 
T;
 // 
 public static final TagInfo GPS_TAG_GPS_DEST_BEARING = new TagInfo(
-GPS Dest Bearing, 0x0018, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
+GPS Dest Bearing, 0x0018, FIELD_TYPE_DESCRIPTION_RATIONAL, 1,
 EXIF_DIRECTORY_GPS);
 
 // 
@@ -174,7 +174,7 @@ public interface GPSTagConstants
 public static final String 
GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_NAUTICAL_MILES = N;
 // 

svn commit: r1211872 - /commons/proper/jexl/branches/2.0/NOTICE.txt

[sebb]

Author: sebb
Date: Thu Dec  8 13:26:57 2011
New Revision: 1211872

URL: http://svn.apache.org/viewvc?rev=1211872view=rev
Log:
Update year

Modified:
commons/proper/jexl/branches/2.0/NOTICE.txt

Modified: commons/proper/jexl/branches/2.0/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/NOTICE.txt?rev=1211872r1=1211871r2=1211872view=diff
==
--- commons/proper/jexl/branches/2.0/NOTICE.txt (original)
+++ commons/proper/jexl/branches/2.0/NOTICE.txt Thu Dec  8 13:26:57 2011
@@ -1,5 +1,5 @@
 Apache Commons JEXL
-Copyright 2001-2010 The Apache Software Foundation
+Copyright 2001-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

svn commit: r1211882 - in /commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg: JpegConstants.java JpegImageParser.java segments/COMSegment.java

[damjan]

Author: damjan
Date: Thu Dec  8 13:43:07 2011
New Revision: 1211882

URL: http://svn.apache.org/viewvc?rev=1211882view=rev
Log:
Add support for parsing the JPEG COM (comment) section,
and present it to the user in ImageInfo.


Added:

commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/segments/COMSegment.java
Modified:

commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java

commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java

Modified: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java?rev=1211882r1=1211881r2=1211882view=diff
==
--- 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java
 Thu Dec  8 13:43:07 2011
@@ -110,6 +110,7 @@ public interface JpegConstants
 public static final int SOS_Marker = 0xFFda;
 public static final int DQTMarker = 0xFFdb;
 public static final int DNLMarker = 0xFFdc;
+public static final int COMMarker = 0xFFfe;
 
 public static final int MARKERS[] = { JPEG_APP0,
 JPEG_APP0_Marker, JPEG_APP1_Marker, JPEG_APP2_Marker,
@@ -118,7 +119,7 @@ public interface JpegConstants
 DHTMarker, SOF5Marker, SOF6Marker, SOF7Marker, SOF8Marker,
 SOF9Marker, SOF10Marker, SOF11Marker, DACMarker, SOF13Marker,
 SOF14Marker, SOF15Marker, EOIMarker, SOS_Marker,
-DQTMarker, DNLMarker };
+DQTMarker, DNLMarker, COMMarker };
 
 public static final byte icc_profile_label[] = { 0x49, 0x43, 0x43, 0x5F,
 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x0 };

Modified: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java?rev=1211882r1=1211881r2=1211882view=diff
==
--- 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java
 Thu Dec  8 13:43:07 2011
@@ -21,6 +21,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,6 +41,7 @@ import org.apache.sanselan.formats.jpeg.
 import org.apache.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
 import org.apache.sanselan.formats.jpeg.segments.App13Segment;
 import org.apache.sanselan.formats.jpeg.segments.App2Segment;
+import org.apache.sanselan.formats.jpeg.segments.COMSegment;
 import org.apache.sanselan.formats.jpeg.segments.DQTSegment;
 import org.apache.sanselan.formats.jpeg.segments.GenericSegment;
 import org.apache.sanselan.formats.jpeg.segments.JFIFSegment;
@@ -172,6 +174,9 @@ public class JpegImageParser extends Ima
  (marker = JPEG_APP15_Marker))
 {
 result.add(new UnknownSegment(marker, segmentData));
+} else if (marker == COMMarker)
+{
+result.add(new COMSegment(marker, segmentData));
 }
 
 if (returnAfterFirst)
@@ -801,7 +806,18 @@ public class JpegImageParser extends Ima
 }
 
 ArrayList Comments = new ArrayList();
-// TODO: comments...
+ArrayList commentSegments = readSegments(byteSource,
+new int[] { COMMarker }, false);
+for (int i = 0; i  commentSegments.size(); i++)
+{
+COMSegment comSegment = (COMSegment) commentSegments.get(i);
+String comment = ;
+try {
+comment = new String(comSegment.comment, ISO-8859-1);
+} catch (UnsupportedEncodingException cannotHappen) {
+}
+Comments.add(comment);
+}
 
 int Number_of_components = fSOFNSegment.numberOfComponents;
 int Precision = fSOFNSegment.precision;
@@ -1048,4 +1064,4 @@ public class JpegImageParser extends Ima
 return true;
 }
 
-}
\ No newline at end of file
+}

Added: 
commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/segments/COMSegment.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/segments/COMSegment.java?rev=1211882view=auto

svn commit: r1211891 - /commons/proper/jexl/branches/2.0/src/main/config/findbugs-exclude-filter.xml

[sebb]

Author: sebb
Date: Thu Dec  8 14:03:13 2011
New Revision: 1211891

URL: http://svn.apache.org/viewvc?rev=1211891view=rev
Log:
Update Findbugs ignore list

Modified:
commons/proper/jexl/branches/2.0/src/main/config/findbugs-exclude-filter.xml

Modified: 
commons/proper/jexl/branches/2.0/src/main/config/findbugs-exclude-filter.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/config/findbugs-exclude-filter.xml?rev=1211891r1=1211890r2=1211891view=diff
==
--- 
commons/proper/jexl/branches/2.0/src/main/config/findbugs-exclude-filter.xml 
(original)
+++ 
commons/proper/jexl/branches/2.0/src/main/config/findbugs-exclude-filter.xml 
Thu Dec  8 14:03:13 2011
@@ -16,11 +16,8 @@
limitations under the License.
 --
 
-!--
-  This file removes JavaCC generated classes from being analyzed by findbugs.
-  Having no way to influence their generation, instructing findbugs to ignore 
them reduces clutter.
---
 FindBugsFilter
+!-- Ignore JavaCC generated classes --
 Match
 Class name=org.apache.commons.jexl2.parser.ParseException/
 /Match
@@ -39,4 +36,16 @@
 Match
 Class name=org.apache.commons.jexl2.parser.TokenMgrError/
 /Match
+!-- Ignore deliberately unused field --
+Match
+Class name=org.apache.commons.jexl2.Interpreter/
+Field name=parameters/
+/Match
+!-- Deprecated and unused, included for binary compat only --
+Match
+Class name=org.apache.commons.jexl2.parser.ASTFloatLiteral/
+/Match
+Match
+Class name=org.apache.commons.jexl2.parser.ASTIntegerLiteral/
+/Match
 /FindBugsFilter

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

[bodewig]

Author: bodewig
Date: Thu Dec  8 14:03:57 2011
New Revision: 1211892

URL: http://svn.apache.org/viewvc?rev=1211892view=rev
Log:
support writing big files using star extensions.  COMPRESS-165.  Patch by John 
Kodis.

Modified:

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

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

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

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

commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java

commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java?rev=1211892r1=1211891r2=1211892view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
 Thu Dec  8 14:03:57 2011
@@ -561,26 +561,11 @@ public class TarArchiveEntry implements 
  * Set this entry's file size.
  *
  * @param size This entry's new file size.
- * @throws IllegalArgumentException if the size is  0
- * or  {@link TarConstants#MAXSIZE} (0777L).
+ * @throws IllegalArgumentException if the size is lt; 0.
  */
 public void setSize(long size) {
-if (size  MAXSIZE || size  0){
-throw new IllegalArgumentException(Size is out of range: +size);
-}
-this.size = size;
-}
-
-/**
- * Set this entry's file size.
- *
- * pInvoked by input stream when reading a PAX header./p
- * @throws IllegalArgumentException if the size is lt; 0
- * @since Apache Commons Compress 1.4
- */
-void adjustSize(long size) {
 if (size  0){
-throw new IllegalArgumentException(Size is out of range:  + 
size);
+throw new IllegalArgumentException(Size is out of range: +size);
 }
 this.size = size;
 }
@@ -751,16 +736,35 @@ public class TarArchiveEntry implements 
 /**
  * Write an entry's header information to a header buffer.
  *
+ * pThis method does not use the star/GNU tar/BSD tar extensions./p
+ *
  * @param outbuf The tar entry header buffer to fill in.
  */
 public void writeEntryHeader(byte[] outbuf) {
+writeEntryHeader(outbuf, false);
+}
+
+/**
+ * Write an entry's header information to a header buffer.
+ *
+ * @param outbuf The tar entry header buffer to fill in.
+ * @param starMode whether to use the star/GNU tar/BSD tar
+ * extension for the size field if the size is bigger than 8GiB
+ * @since Apache Commons Compress 1.4
+ */
+public void writeEntryHeader(byte[] outbuf, boolean starMode) {
 int offset = 0;
 
 offset = TarUtils.formatNameBytes(name, outbuf, offset, NAMELEN);
 offset = TarUtils.formatOctalBytes(mode, outbuf, offset, MODELEN);
 offset = TarUtils.formatOctalBytes(userId, outbuf, offset, UIDLEN);
 offset = TarUtils.formatOctalBytes(groupId, outbuf, offset, GIDLEN);
-offset = TarUtils.formatLongOctalBytes(size, outbuf, offset, SIZELEN);
+if (size  TarConstants.MAXSIZE  !starMode) {
+// size is in PAX header
+offset = TarUtils.formatLongOctalBytes(0, outbuf, offset, SIZELEN);
+} else {
+offset = TarUtils.formatLongOctalOrBinaryBytes(size, outbuf, 
offset, SIZELEN);
+}
 offset = TarUtils.formatLongOctalBytes(modTime, outbuf, offset, 
MODTIMELEN);
 
 int csOffset = offset;

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=1211892r1=1211891r2=1211892view=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
 Thu Dec  8 14:03:57 2011
@@ -356,7 +356,7 @@ public class TarArchiveInputStream exten
 } else if (uname.equals(key)){
   

svn commit: r1211894 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/annotations/NoJexl.java

[henrib]

Author: henrib
Date: Thu Dec  8 14:07:14 2011
New Revision: 1211894

URL: http://svn.apache.org/viewvc?rev=1211894view=rev
Log:
JEXL-123:
Javadoc;

Modified:

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/annotations/NoJexl.java

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/annotations/NoJexl.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/annotations/NoJexl.java?rev=1211894r1=1211893r2=1211894view=diff
==
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/annotations/NoJexl.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/annotations/NoJexl.java
 Thu Dec  8 14:07:14 2011
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
 /**
  * Indicates JEXL Introspection should not see this element.
  * p
- * This allows to completely hide a package, class, interface, constructor, 
method of field from 
+ * This allows to completely hide a package, class, interface, constructor, 
method or field from 
  * JEXL; a NoJexl annotated element will not be usable through any kind of 
JEXL expression or script.
  * /p
  * pSee {@link org.apache.commons.jexl3.JexlSandbox} for another way to 
restrict JEXL access.

svn commit: r1211931 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java test/java/org/apache/commons/compress/archivers/tar/TarArc

[bodewig]

Author: bodewig
Date: Thu Dec  8 15:22:16 2011
New Revision: 1211931

URL: http://svn.apache.org/viewvc?rev=1211931view=rev
Log:
Write big files in PAX/POSIX mode.  COMPRESS-165

Modified:

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

commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=1211931r1=1211930r2=1211931view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
 Thu Dec  8 15:22:16 2011
@@ -21,6 +21,9 @@ package org.apache.commons.compress.arch
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.utils.ArchiveUtils;
@@ -207,6 +210,7 @@ public class TarArchiveOutputStream exte
 throw new IOException(Stream has already been finished);
 }
 TarArchiveEntry entry = (TarArchiveEntry) archiveEntry;
+MapString, String paxHeaders = new HashMapString, String();
 if (entry.getName().length() = TarConstants.NAMELEN) {
 
 if (longFileMode == LONGFILE_GNU) {
@@ -227,14 +231,21 @@ public class TarArchiveOutputStream exte
+ TarConstants.NAMELEN +  bytes));
 }
 }
+
 if (entry.getSize()  TarConstants.MAXSIZE) {
-if (bigFileMode != BIGFILE_STAR) {
+if (bigFileMode == BIGFILE_POSIX) {
+paxHeaders.put(size, String.valueOf(entry.getSize()));
+} else if (bigFileMode != BIGFILE_STAR) {
 throw new RuntimeException(file size ' + entry.getSize()
+ ' is too big (  
+ TarConstants.MAXSIZE +  bytes));
 }
 }
 
+if (paxHeaders.size()  0) {
+writePaxHeaders(entry.getName(), paxHeaders);
+}
+
 entry.writeEntryHeader(recordBuf, bigFileMode == BIGFILE_STAR);
 buffer.writeRecord(recordBuf);
 
@@ -368,6 +379,47 @@ public class TarArchiveOutputStream exte
 }
 
 /**
+ * Writes a PAX extended header with the given map as contents.
+ * @since Apache Commons Compress 1.4
+ */
+void writePaxHeaders(String entryName,
+ MapString, String headers) throws IOException {
+String name = ./PaxHeaders.X/ + entryName;
+if (name.length()  TarConstants.NAMELEN) {
+name = name.substring(0, TarConstants.NAMELEN);
+}
+TarArchiveEntry pex = new TarArchiveEntry(name,
+  
TarConstants.LF_PAX_EXTENDED_HEADER_LC);
+
+StringWriter w = new StringWriter();
+for (Map.EntryString, String h : headers.entrySet()) {
+String key = h.getKey();
+String value = h.getValue();
+int len = key.length() + value.length()
++ 3 /* blank, equals and newline */
++ 2 /* guess 9  actual length  100 */;
+String line = len +   + key + = + value + \n;
+int actualLength = line.getBytes(UTF-8).length;
+while (len != actualLength) {
+// Adjust for cases where length  10 or  100
+// or where UTF-8 encoding isn't a single octet
+// per character.
+// Must be in loop as size may go from 99 to 100 in
+// first pass so we'd need a second.
+len = actualLength;
+line = len +   + key + = + value + \n;
+actualLength = line.getBytes(UTF-8).length;
+}
+w.write(line);
+}
+byte[] data = w.toString().getBytes(UTF-8);
+pex.setSize(data.length);
+putArchiveEntry(pex);
+write(data);
+closeArchiveEntry();
+}
+
+/**
  * Write an EOF (end of archive) record to the tar archive.
  * An EOF record consists of a record of all zeros.
  */

Modified: 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
URL: 

svn commit: r1211943 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java test/java/org/apache/commons/compress/archivers/tar/TarArc

[bodewig]

Author: bodewig
Date: Thu Dec  8 16:12:52 2011
New Revision: 1211943

URL: http://svn.apache.org/viewvc?rev=1211943view=rev
Log:
Support the POSIX way of writing tar entries with names longer than 100 chars.  
COMPRESS-166

Modified:

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

commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=1211943r1=1211942r2=1211943view=diff
==
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
 Thu Dec  8 16:12:52 2011
@@ -45,6 +45,9 @@ public class TarArchiveOutputStream exte
 /** GNU tar extensions are used to store long file names in the archive. */
 public static final int LONGFILE_GNU = 2;
 
+/** POSIX/PAX extensions are used to store long file names in the archive. 
*/
+public static final int LONGFILE_POSIX = 3;
+
 /** Fail if a big file (gt; 8GiB) is required in the archive. */
 public static final int BIGFILE_ERROR = 0;
 
@@ -213,7 +216,9 @@ public class TarArchiveOutputStream exte
 MapString, String paxHeaders = new HashMapString, String();
 if (entry.getName().length() = TarConstants.NAMELEN) {
 
-if (longFileMode == LONGFILE_GNU) {
+if (longFileMode == LONGFILE_POSIX) {
+paxHeaders.put(path, entry.getName());
+} else if (longFileMode == LONGFILE_GNU) {
 // create a TarEntry for the LongLink, the contents
 // of which are the entry's name
 TarArchiveEntry longLinkEntry = new 
TarArchiveEntry(TarConstants.GNU_LONGLINK,
@@ -385,8 +390,8 @@ public class TarArchiveOutputStream exte
 void writePaxHeaders(String entryName,
  MapString, String headers) throws IOException {
 String name = ./PaxHeaders.X/ + entryName;
-if (name.length()  TarConstants.NAMELEN) {
-name = name.substring(0, TarConstants.NAMELEN);
+if (name.length() = TarConstants.NAMELEN) {
+name = name.substring(0, TarConstants.NAMELEN - 1);
 }
 TarArchiveEntry pex = new TarArchiveEntry(name,
   
TarConstants.LF_PAX_EXTENDED_HEADER_LC);

Modified: 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java?rev=1211943r1=1211942r2=1211943view=diff
==
--- 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
 (original)
+++ 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
 Thu Dec  8 16:12:52 2011
@@ -182,4 +182,26 @@ public class TarArchiveOutputStreamTest 
 
 return bos.toByteArray();
 }
+
+public void testWriteLongFileNamePosixMode() throws Exception {
+String n = 01234567890123456789012345678901234567890123456789
++ 01234567890123456789012345678901234567890123456789
++ 01234567890123456789012345678901234567890123456789;
+TarArchiveEntry t =
+new TarArchiveEntry(n);
+t.setSize(10 * 1024);
+ByteArrayOutputStream bos = new ByteArrayOutputStream();
+TarArchiveOutputStream tos = new TarArchiveOutputStream(bos);
+tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+tos.putArchiveEntry(t);
+tos.write(new byte[10 * 1024]);
+tos.closeArchiveEntry();
+byte[] data = bos.toByteArray();
+assertEquals(160 path= + n + \n,
+ new String(data, 512, 160, UTF-8));
+TarArchiveInputStream tin =
+new TarArchiveInputStream(new ByteArrayInputStream(data));
+TarArchiveEntry e = tin.getNextTarEntry();
+assertEquals(n, e.getName());
+}
 }
\ No newline at end of file

svn commit: r1211956 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3: ./ pom.xml

[sebb]

Author: sebb
Date: Thu Dec  8 16:28:45 2011
New Revision: 1211956

URL: http://svn.apache.org/viewvc?rev=1211956view=rev
Log:
Tag 2.1 RC3

Added:
commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/
  - copied from r1211947, commons/proper/jexl/branches/2.0/
Modified:
commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/pom.xml

Modified: commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/pom.xml?rev=1211956r1=1211947r2=1211956view=diff
==
--- commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/pom.xml (original)
+++ commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/pom.xml Thu Dec  8 16:28:45 
2011
@@ -24,7 +24,7 @@
 modelVersion4.0.0/modelVersion
 groupIdorg.apache.commons/groupId
 artifactIdcommons-jexl/artifactId
-version2.1-SNAPSHOT/version
+version2.1/version
 nameCommons JEXL/name
 inceptionYear2001/inceptionYear
 descriptionThe Commons Jexl library is an implementation of the JSTL 
Expression Language with extensions./description
@@ -36,9 +36,9 @@
 /issueManagement
 
 scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/branches/2.0/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/branches/2.0/developerConnection
-
urlhttp://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1/developerConnection
+
urlhttp://svn.apache.org/viewvc/commons/proper/jexl/tags/COMMONS_JEXL_2_1/url
 /scm
 
 distributionManagement

svn commit: r1211969 - in /commons/proper/compress/trunk/src: changes/changes.xml site/xdoc/examples.xml site/xdoc/tar.xml

[bodewig]

Author: bodewig
Date: Thu Dec  8 16:43:50 2011
New Revision: 1211969

URL: http://svn.apache.org/viewvc?rev=1211969view=rev
Log:
documenation for big file support and PAX support fro writing long file names 
in tar.  COMPRESS-165 and COMPRESS-166

Added:
commons/proper/compress/trunk/src/site/xdoc/tar.xml   (with props)
Modified:
commons/proper/compress/trunk/src/changes/changes.xml
commons/proper/compress/trunk/src/site/xdoc/examples.xml

Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1211969r1=1211968r2=1211969view=diff
==
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Thu Dec  8 16:43:50 
2011
@@ -66,6 +66,15 @@ The action type attribute can be add,u
 extensions for files that are longer than 8 GByte as well as
 archives that use the POSIX/PAX variant.
   /action
+  action issue=COMPRESS-165 type=update date=2011-12-08
+The tar package can now write archives that use star/GNU/BSD
+extensions for files that are longer than 8 GByte as well as
+archives that use the POSIX/PAX variant.
+  /action
+  action issue=COMPRESS-166 type=update date=2011-12-08
+The tar package can now use the POSIX/PAX variant for writing
+entries with names longer than 100 characters.
+  /action
 /release
 release version=1.3 date=2011-11-01
  description=Release 1.3 - API compatible to 1.2 but requires 
Java5 at runtime

Modified: commons/proper/compress/trunk/src/site/xdoc/examples.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/site/xdoc/examples.xml?rev=1211969r1=1211968r2=1211969view=diff
==
--- commons/proper/compress/trunk/src/site/xdoc/examples.xml (original)
+++ commons/proper/compress/trunk/src/site/xdoc/examples.xml Thu Dec  8 
16:43:50 2011
@@ -174,39 +174,8 @@ LOOP UNTIL entry.getSize() HAS BEEN READ
 
   subsection name=tar
 
-pIn addition to the information stored
-  in codeArchiveEntry/code a codeTarArchiveEntry/code
-  stores various attributes including information about the
-  original owner and permissions./p
-
-pThere are several different tar formats and the TAR package
-  of Compress 1.0 only provides the common functionality of
-  the existing variants./p
-pThe original format (often called ustar) didn't support
-  file names longer than 100 characters and the tar package
-  will fail if you try to add an entry longer than that.
-  The codelongFileMode/code option
-  of codeTarArchiveOutputStream/code can be used to make
-  the archive truncate such names or use a GNU tar variant now
-  refered to as oldgnu of storing such names.  If you choose
-  the GNU tar option, the archive can not be extracted using
-  many other tar implementations like the ones of OpenBSD,
-  Solaris or MacOS X./p
-pThe tar package does not support the full POSIX tar
-  standard nor more modern GNU extension of said standard.  It
-  cannot deal with entries larger than 2 GByte either./p
-
-pcodeTarArchiveInputStream/code will recognize the GNU
-  tar extension for long file names and read the longer names
-  accordingly./p
-
-pcodeTarArchiveInputStream/code will recognize sparse
-  file entries stored using the oldgnu format
-  (code-#x2d;sparse-version=0.0/code in GNU tar) but is
-  not able to extract them correctly.
-  a href=#Unsupported FeaturescodecanReadEntryData/code/a
-  will return false on such entries.  The other variants of
-  sparse files can currently not be detected at all./p
+pThe TAR package has a a href=tar.htmldedicated
+documentation page/a./p
 
 pAdding an entry to a tar archive:/p
 source![CDATA[

Added: commons/proper/compress/trunk/src/site/xdoc/tar.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/site/xdoc/tar.xml?rev=1211969view=auto
==
--- commons/proper/compress/trunk/src/site/xdoc/tar.xml (added)
+++ commons/proper/compress/trunk/src/site/xdoc/tar.xml Thu Dec  8 16:43:50 2011
@@ -0,0 +1,113 @@
+?xml version=1.0?
+!--
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the License); you may not use this file except in compliance 

Nexus: Staging Completed.

[Nexus Repository Manager]

Description:Prepare for release voteDetails:The following artifacts have been staged to the org.apache.commons-298 (u:sebb, a:80.176.146.62) repository.archetype-catalog.xmlcommons-jexl-2.1-src.tar.gzcommons-jexl-2.1-bin.zipcommons-jexl-2.1.jarcommons-jexl-2.1-bin.zip.asccommons-jexl-2.1-src.zipcommons-jexl-2.1-javadoc.jarcommons-jexl-2.1.pom.asccommons-jexl-2.1-bin.tar.gzcommons-jexl-2.1-javadoc.jar.asccommons-jexl-2.1-sources.jarcommons-jexl-2.1-tests.jarcommons-jexl-2.1.pomcommons-jexl-2.1.jar.asccommons-jexl-2.1-src.zip.asccommons-jexl-2.1-src.tar.gz.asccommons-jexl-2.1-sources.jar.asccommons-jexl-2.1-bin.tar.gz.asccommons-jexl-2.1-tests.jar.asc

svn commit: r1212028 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 18:48:14 2011
New Revision: 1212028

URL: http://svn.apache.org/viewvc?rev=1212028view=rev
Log:
removed lines bigger than 120 chars

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1212028r1=1212027r2=1212028view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 18:48:14 2011
@@ -27,17 +27,17 @@ import java.lang.reflect.Method;
 final class RecordedInvocation
 {
 
-
//**
+
//**
 // Fields
-
//**
+
//**
 
 private final Method invokedMethod;
 
 private final Object[] arguments;
 
-
//**
+
//**
 // Constructors
-
//**
+
//**
 
 /**
  * Create a new RecordedInvocation instance.
@@ -51,9 +51,9 @@ final class RecordedInvocation
 this.arguments = arguments;
 }
 
-
//**
+
//**
 // Canonical Methods
-
//**
+
//**
 
 /**
  * Get the invokedMethod.

svn commit: r1212029 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 18:49:33 2011
New Revision: 1212029

URL: http://svn.apache.org/viewvc?rev=1212029view=rev
Log:
used the already used license format (the current one causes a checkstyle 
warning)

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1212029r1=1212028r2=1212029view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 18:49:33 2011
@@ -1,20 +1,22 @@
 package org.apache.commons.digester3;
 
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import java.lang.reflect.Method;

svn commit: r1212030 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 18:50:45 2011
New Revision: 1212030

URL: http://svn.apache.org/viewvc?rev=1212030view=rev
Log:
fixed params names

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java?rev=1212030r1=1212029r2=1212030view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
 Thu Dec  8 18:50:45 2011
@@ -295,7 +295,7 @@ public class ObjectCreateRule
  * not supplied by a {@link CallParamRule}, the corresponding item from 
this array will be used
  * to construct the final object as well.
  *
- * @param the default constructor arguments.
+ * @param constructorArguments the default constructor arguments.
  * @since 3.2
  */
 public void setDefaultConstructorArguments( Object... constructorArguments 
)

svn commit: r1212031 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 18:54:04 2011
New Revision: 1212031

URL: http://svn.apache.org/viewvc?rev=1212031view=rev
Log:
fixed lines  120 chars

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java?rev=1212031r1=1212030r2=1212031view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
 Thu Dec  8 18:54:04 2011
@@ -344,9 +344,11 @@ public class ObjectCreateRule
 {
 if ( getDigester().getLogger().isDebugEnabled() )
 {
-getDigester().getLogger().debug( format( 
[ObjectCreateRule]{%s} New '%s' using default empty constructor,
- 
getDigester().getMatch(),
- clazz.getName() ) );
+getDigester()
+.getLogger()
+.debug( format( [ObjectCreateRule]{%s} New '%s' using 
default empty constructor,
+getDigester().getMatch(),
+clazz.getName() ) );
 }
 
 instance = clazz.newInstance();
@@ -359,10 +361,11 @@ public class ObjectCreateRule
 
 if ( constructor == null )
 {
-throw new SAXException( format( [ObjectCreateRule]{%s} 
Class '%s' does not have a construcor with types %s,
-getDigester().getMatch(),
-clazz.getName(),
-Arrays.toString( 
constructorArgumentTypes ) ) );
+throw new SAXException(
+   format( [ObjectCreateRule]{%s} Class '%s' 
does not have a construcor with types %s,
+   getDigester().getMatch(),
+   clazz.getName(),
+   Arrays.toString( 
constructorArgumentTypes ) ) );
 }
 proxyManager = new ProxyManager( clazz, constructor, 
defaultConstructorArguments, getDigester() );
 }

svn commit: r1212032 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 18:54:54 2011
New Revision: 1212032

URL: http://svn.apache.org/viewvc?rev=1212032view=rev
Log:
added missing @since tag

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java?rev=1212032r1=1212031r2=1212032view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/RecordedInvocation.java
 Thu Dec  8 18:54:54 2011
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
  * Detached representation of a method invocation.
  * From Commons [proxy] v2 branch.
  * @author James Carman
+ * @since 3.2
  */
 final class RecordedInvocation
 {

svn commit: r1212046 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:18:17 2011
New Revision: 1212046

URL: http://svn.apache.org/viewvc?rev=1212046view=rev
Log:
fixed checkstyle violation: Expected @param tag for 'elementName'.

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java?rev=1212046r1=1212045r2=1212046view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/NestedPropertiesBuilder.java
 Thu Dec  8 19:18:17 2011
@@ -77,7 +77,7 @@ public final class NestedPropertiesBuild
 /**
  * Allows element2property mapping to be overridden.
  *
- * @param elementName
+ * @param elementName The child xml element to match
  * @return the property alias builder
  * @since 3.2
  */

svn commit: r1212049 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:19:17 2011
New Revision: 1212049

URL: http://svn.apache.org/viewvc?rev=1212049view=rev
Log:
removed useless empty line

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java?rev=1212049r1=1212048r2=1212049view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 Thu Dec  8 19:19:17 2011
@@ -34,7 +34,6 @@ public final class ObjectCreateBuilder
 extends AbstractBackToLinkedRuleBuilderObjectCreateRule
 {
 
-
 private final ClassLoader classLoader;
 
 private Class? type;

svn commit: r1212055 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:22:39 2011
New Revision: 1212055

URL: http://svn.apache.org/viewvc?rev=1212055view=rev
Log:
added missing javadoc

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java?rev=1212055r1=1212054r2=1212055view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 Thu Dec  8 19:22:39 2011
@@ -119,8 +119,9 @@ public final class ObjectCreateBuilder
 }
 
 /**
+ * Allows users to specify constructor argument type names.
  *
- * @return
+ * @return this builder instance
  * @since 3.2
  */
 public ObjectCreateBuilder usingConstructor( String...paramTypeNames )
@@ -150,8 +151,9 @@ public final class ObjectCreateBuilder
 }
 
 /**
+ * Allows users to specify constructor argument types.
  *
- * @return
+ * @return this builder instance
  * @since 3.2
  */
 public ObjectCreateBuilder usingConstructor( Class?... 
constructorArgumentTypes )
@@ -167,6 +169,13 @@ public final class ObjectCreateBuilder
 return this;
 }
 
+/**
+ * Allows users to specify default constructor arguments.
+ *
+ * @param defaultConstructorArguments
+ * @return the default constructor arguments.
+ * @since 3.2
+ */
 public ObjectCreateBuilder usingDefaultConstructorArguments( Object... 
defaultConstructorArguments)
 {
 if ( defaultConstructorArguments == null )

svn commit: r1212057 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:23:34 2011
New Revision: 1212057

URL: http://svn.apache.org/viewvc?rev=1212057view=rev
Log:
fixed lines longer than 120 chars

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java?rev=1212057r1=1212056r2=1212057view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 Thu Dec  8 19:23:34 2011
@@ -160,7 +160,8 @@ public final class ObjectCreateBuilder
 {
 if ( constructorArgumentTypes == null )
 {
-reportError( createObject().usingConstructor( Class?[] ), 
NULL constructorArgumentTypes not allowed );
+reportError( createObject().usingConstructor( Class?[] ),
+ NULL constructorArgumentTypes not allowed );
 return this;
 }
 
@@ -180,7 +181,8 @@ public final class ObjectCreateBuilder
 {
 if ( defaultConstructorArguments == null )
 {
-reportError( createObject().usingDefaultConstructorArguments( 
Object[] ), NULL defaultConstructorArguments not allowed );
+reportError( createObject().usingDefaultConstructorArguments( 
Object[] ),
+ NULL defaultConstructorArguments not allowed );
 return this;
 }
 

svn commit: r1212058 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:24:07 2011
New Revision: 1212058

URL: http://svn.apache.org/viewvc?rev=1212058view=rev
Log:
minor format

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java?rev=1212058r1=1212057r2=1212058view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 Thu Dec  8 19:24:07 2011
@@ -177,7 +177,7 @@ public final class ObjectCreateBuilder
  * @return the default constructor arguments.
  * @since 3.2
  */
-public ObjectCreateBuilder usingDefaultConstructorArguments( Object... 
defaultConstructorArguments)
+public ObjectCreateBuilder usingDefaultConstructorArguments( Object... 
defaultConstructorArguments )
 {
 if ( defaultConstructorArguments == null )
 {

svn commit: r1212059 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:24:47 2011
New Revision: 1212059

URL: http://svn.apache.org/viewvc?rev=1212059view=rev
Log:
minor format

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java?rev=1212059r1=1212058r2=1212059view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetPropertiesIgnoreRule.java
 Thu Dec  8 19:24:47 2011
@@ -33,7 +33,7 @@ final class SetPropertiesIgnoreRule
 /**
  * {@inheritDoc}
  */
-public void begin(String namespace, String name, Attributes attributes)
+public void begin( String namespace, String name, Attributes attributes )
 throws Exception
 {
 String attributeName = attributes.getValue( attr-name );

svn commit: r1212066 - /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:33:09 2011
New Revision: 1212066

URL: http://svn.apache.org/viewvc?rev=1212066view=rev
Log:
fixed javadocs

Modified:

commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java?rev=1212066r1=1212065r2=1212066view=diff
==
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/binder/ObjectCreateBuilder.java
 Thu Dec  8 19:33:09 2011
@@ -121,6 +121,7 @@ public final class ObjectCreateBuilder
 /**
  * Allows users to specify constructor argument type names.
  *
+ * @param the constructor argument type names
  * @return this builder instance
  * @since 3.2
  */
@@ -153,6 +154,7 @@ public final class ObjectCreateBuilder
 /**
  * Allows users to specify constructor argument types.
  *
+ * @param the constructor argument types
  * @return this builder instance
  * @since 3.2
  */
@@ -173,8 +175,8 @@ public final class ObjectCreateBuilder
 /**
  * Allows users to specify default constructor arguments.
  *
- * @param defaultConstructorArguments
- * @return the default constructor arguments.
+ * @param defaultConstructorArguments the default constructor arguments.
+ * @return this builder instance
  * @since 3.2
  */
 public ObjectCreateBuilder usingDefaultConstructorArguments( Object... 
defaultConstructorArguments )

svn commit: r1212069 - /commons/proper/digester/trunk/src/examples/pom.xml

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 19:37:38 2011
New Revision: 1212069

URL: http://svn.apache.org/viewvc?rev=1212069view=rev
Log:
upgraded samples to use release 3.2

Modified:
commons/proper/digester/trunk/src/examples/pom.xml

Modified: commons/proper/digester/trunk/src/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/examples/pom.xml?rev=1212069r1=1212068r2=1212069view=diff
==
--- commons/proper/digester/trunk/src/examples/pom.xml (original)
+++ commons/proper/digester/trunk/src/examples/pom.xml Thu Dec  8 19:37:38 2011
@@ -23,7 +23,7 @@
 
   groupIdorg.apache.commons/groupId
   artifactIdcommons-digester3-samples/artifactId
-  version3.1/version
+  version3.2/version
   packagingpom/packaging
 
   nameCommons Digester :: Examples/name

svn commit: r1212076 - /commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java

[damjan]

Author: damjan
Date: Thu Dec  8 20:02:24 2011
New Revision: 1212076

URL: http://svn.apache.org/viewvc?rev=1212076view=rev
Log:
Rather than hardcoding which images break the ExifRewriteTest,
detect fields that are broken during the test
and ignore only those fields.

Sanselan cannot transfer raw tag bytes from image to image
because the byte order might change (at least, for non-ASCII fields).
But since it cannot properly parse 8 bit unclean strings (which aren't
supposed to exist according to EXIF), it cannot properly copy them either,
and ends up corrupting them when rewriting EXIF. For now detect and ignore
these fields. In future it could be possible to transfer raw bytes
from TiffField to TiffOutputField when the type is ASCII.

This gets the test suite to *finally* pass.


Modified:

commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java

Modified: 
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java?rev=1212076r1=1212075r2=1212076view=diff
==
--- 
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java
 (original)
+++ 
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java
 Thu Dec  8 20:02:24 2011
@@ -105,11 +105,6 @@ public class ExifRewriteTest extends Exi
 File imageFile = (File) images.get(i);
 Debug.debug(imageFile, imageFile);
 
-// This test image contains invalid EXIF and would break the test.
-if (imageFile.getName().equals(Oregon Scientific DS6639 - 
DSC_0307.JPG)) {
-continue;
-}
-
 boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
 if (ignoreImageData)
 continue;
@@ -191,11 +186,6 @@ public class ExifRewriteTest extends Exi
 
 File imageFile = (File) images.get(i);
 
-// This test image contains invalid EXIF and would break the test.
-if (imageFile.getName().equals(Oregon Scientific DS6639 - 
DSC_0307.JPG)) {
-continue;
-}
-
 try
 {
 
@@ -438,6 +428,25 @@ public class ExifRewriteTest extends Exi
 continue;
 }
 
+if (oldField.fieldType == FIELD_TYPE_ASCII)
+{
+// Sanselan currently doesn't correctly rewrite
+// strings if any byte had the highest bit set,
+// so if the source had that, all bets are off.
+byte[] rawBytes = oldField.fieldType.getRawBytes(oldField);
+boolean hasInvalidByte = false;
+for (int k = 0; k  rawBytes.length; k++)
+{
+if ((rawBytes[k]  0x80) != 0)
+{
+hasInvalidByte = true;
+break;
+}
+}
+if (hasInvalidByte)
+continue;
+}
+
 if (!oldField.tagInfo.isOffset())
 {
 if (oldField.tagInfo.isText())

svn commit: r1212090 - in /commons/proper/digester/trunk/src/site: site.xml xdoc/index.xml

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 20:32:42 2011
New Revision: 1212090

URL: http://svn.apache.org/viewvc?rev=1212090view=rev
Log:
restructuring the home page, added 3.2 release and removed 2.X releases 
description

Modified:
commons/proper/digester/trunk/src/site/site.xml
commons/proper/digester/trunk/src/site/xdoc/index.xml

Modified: commons/proper/digester/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/site/site.xml?rev=1212090r1=1212089r2=1212090view=diff
==
--- commons/proper/digester/trunk/src/site/site.xml (original)
+++ commons/proper/digester/trunk/src/site/site.xml Thu Dec  8 20:32:42 2011
@@ -49,7 +49,11 @@
   - Note that the links in these menu options require manual installation 
of the
   - appropriate dirs on the website; maven won't set this up.
 --
-menu name=Release 3.1 (Current)
+menu name=Release 3.2 (Current)
+  item name=Javadoc 
href=http://commons.apache.org/digester/commons-digester-3.2/apidocs; /
+  item name=Release Notes 
href=http://commons.apache.org/digester/commons-digester-3.2/RELEASE-NOTES.txt;
 /
+/menu
+menu name=Release 3.1
   item name=Javadoc 
href=http://commons.apache.org/digester/commons-digester-3.1/apidocs; /
   item name=Release Notes 
href=http://commons.apache.org/digester/commons-digester-3.1/RELEASE-NOTES.txt;
 /
 /menu
@@ -57,6 +61,7 @@
   item name=Javadoc 
href=http://commons.apache.org/digester/commons-digester-3.0/apidocs; /
   item name=Release Notes 
href=http://commons.apache.org/digester/commons-digester-3.0/RELEASE-NOTES.txt;
 /
 /menu
+!-- maintain it just for old users --
 menu name=Release 2.1
   item name=Guide 
href=http://commons.apache.org/digester/commons-digester-2.1/core.html;
 item name=Core APIs
href=http://commons.apache.org/digester/commons-digester-2.1/core.html; /

Modified: commons/proper/digester/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/site/xdoc/index.xml?rev=1212090r1=1212089r2=1212090view=diff
==
--- commons/proper/digester/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/digester/trunk/src/site/xdoc/index.xml Thu Dec  8 20:32:42 
2011
@@ -68,6 +68,27 @@ download the files.
 /section
 
 section name=Releases
+subsection name=Digester 3.2 (December 2011)
+  pThe Digester 3.2 release is a maintenance release that adds the most 
innovating feature ever, adding the
+  objects a href=./guide/constructor.htmlConstructor/a feature./p
+  pTake a look at Digester 3.2 release a 
href=./changes-report.html#a3.2changes list/a for more results./p
+  pDigester 3.2 brequires a minimum of JDK 1.5/b./p
+  pThe recommended dependency set for Digester 3.2 is:/p
+  table
+tr
+  th colspan=3Recommended Dependency Set/th
+/tr
+tr
+  thDigester/th
+  td+Logging 1.1.1/td
+  td+BeanUtils 1.8.3/td
+  td+CGLIB 2.2.2/td
+/tr
+  /table
+  pSince dependencies increased by number, since 3.2 release, Digester 
is distributed also in a single artifact
+  with shaded dependencies./p
+/subsection
+
 subsection name=Digester 3.1 Release (October 2011)
   pThe Digester 3.1 release is a maintenance release that adds the
   a href=./guide/async.htmlAsynchronous parser/a feature./p
@@ -109,85 +130,6 @@ Daniele Testa [mrwolfgraphics AT gmail D
 /li
 /ul
 /subsection
-
-
-subsection name=Digester 2.1 Release (September 2010)
-p
-Digester 2.1 is a minor release with new features, a new 
codeannotations/code package
-adds facilities to configure the Digester using the Java5 language meta-data 
annotations,
-allowing Digester instances creation introspecting the target POJOs, using a 
provided set
-of annotations. New projects are encouraged to use this release of digester.
-br/
-There are breaking changes from Digester 2.0, see release notes in detail 
before choosing
-to upgrade.
-br/
-There is no urgency for existing projects to upgrade; Digester 2.0 has proven 
to be a
-stable release.
-/p
-p
-Digester 2.1 brequires a minimum of JDK 1.5/b.
-/p
-p
-The recommended dependency set for Digester 2.1 is:
-/p
-table
-tr
-th colspan='3'Recommended Dependency Set/th
-/tr
-tr
-tdDigester/td
-td+Logging 1.1.1/td
-td+BeanUtils 1.8.3/td
-/tr
-/table
-p
-It is also possible to use Logging 1.0.x or BeanUtils 1.8.0 instead.
-/p
-/subsection
-
-subsection name='Digester 2.0 Release (January 2009)'
-p
-Digester 2.0 is a major release. New projects are encouraged to use this 
release
-of digester. There are breaking changes from Digester 1.8, see release notes
-in detail before choosing to upgrade. There is 

svn commit: r1212128 - /commons/proper/digester/trunk/NOTICE.txt

[simonetripodi]

Author: simonetripodi
Date: Thu Dec  8 21:14:47 2011
New Revision: 1212128

URL: http://svn.apache.org/viewvc?rev=1212128view=rev
Log:
added CGLIB and ASM in the NOTICE file

Modified:
commons/proper/digester/trunk/NOTICE.txt

Modified: commons/proper/digester/trunk/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/NOTICE.txt?rev=1212128r1=1212127r2=1212128view=diff
==
--- commons/proper/digester/trunk/NOTICE.txt (original)
+++ commons/proper/digester/trunk/NOTICE.txt Thu Dec  8 21:14:47 2011
@@ -3,3 +3,10 @@ Copyright 2001-2011 The Apache Software 
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+
+CGLIB - licensed under the Apache License v2.0.
+This product includes software developed by
+Juozas Baliuka, Chris Nokleberg and Sam Berlin (http://cglib.sourceforge.net/)
+
+ASM - Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved. (http://asm.ow2.org/)

svn commit: r1212260 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java

[celestin]

Author: celestin
Date: Fri Dec  9 06:45:09 2011
New Revision: 1212260

URL: http://svn.apache.org/viewvc?rev=1212260view=rev
Log:
Cosmetic changes to transform.FastFourierTransformer (MATH-677).

Modified:

commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java?rev=1212260r1=1212259r2=1212260view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
 Fri Dec  9 06:45:09 2011
@@ -52,9 +52,8 @@ public class FastFourierTransformer impl
 /** Serializable version identifier. */
 static final long serialVersionUID = 5138259215438106000L;
 
-
 /**
- * {@code true} if the orthogonal version of the FFT should be used.
+ * {@code true} if the unitary version of the DFT should be used.
  *
  * @see #create()
  * @see #createUnitary()
@@ -64,19 +63,12 @@ public class FastFourierTransformer impl
 /** The roots of unity. */
 private RootsOfUnity roots = new RootsOfUnity();
 
-/** Construct a default transformer. */
-private FastFourierTransformer() {
-super();
-this.unitary = false;
-}
-
 /**
  * Creates a new instance of this class, with various normalization
  * conventions.
  *
- * @param unitary {@code false} if the direct Fourier transform is
- * emnot/em to be scaled, {@code true} if it is to be scaled so as to
- * make the transform unitary.
+ * @param unitary {@code false} if the DFT is emnot/em to be scaled,
+ * {@code true} if it is to be scaled so as to make the transform unitary.
  * @see #create()
  * @see #createUnitary()
  */
@@ -88,17 +80,18 @@ public class FastFourierTransformer impl
  * p
  * Returns a new instance of this class. The returned transformer uses the
  * normalizing conventions described below.
- * /p
  * ul
  * liForward transform:
  * ysubn/sub = sum;subk=0/subsupN-1/sup
  * xsubk/sub exp(-2pi;i n k / N),/li
  * liInverse transform:
  * xsubk/sub = Nsup-1/sup sum;subn=0/subsupN-1/sup
- * ysubn/sub exp(2pi;i n k / N)./li
+ * ysubn/sub exp(2pi;i n k / N),/li
  * /ul
+ * where N is the size of the data sample.
+ * /p
  *
- * @return a new FFT transformer, with standard normalizing conventions
+ * @return a new DFT transformer, with standard normalizing conventions
  */
 public static FastFourierTransformer create() {
 return new FastFourierTransformer(false);
@@ -116,7 +109,7 @@ public class FastFourierTransformer impl
  * xsubk/sub = Nsup-1/2/sup sum;subn=0/subsupN-1/sup
  * ysubn/sub exp(2pi;i n k / N),/li
  * /ul
- * which make the transform unitary.
+ * which make the transform unitary. N is the size of the data sample.
  * /p
  *
  * @return a new FFT transformer, with unitary normalizing conventions

svn commit: r1212262 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/transform/FastCosineTransformer.java test/java/org/apache/commons/math/transform/FastCosineTransformerTest.j

[celestin]

Author: celestin
Date: Fri Dec  9 06:47:23 2011
New Revision: 1212262

URL: http://svn.apache.org/viewvc?rev=1212262view=rev
Log:
In distribution.FastCosineTransformer, replaced the pair transform2() / 
inverseTransform2() with two factory methods: create() and createOrthogonal() 
(MATH-677).

Modified:

commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java

commons/proper/math/trunk/src/test/java/org/apache/commons/math/transform/FastCosineTransformerTest.java

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java?rev=1212262r1=1212261r2=1212262view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
 Fri Dec  9 06:47:23 2011
@@ -40,167 +40,142 @@ import org.apache.commons.math.util.Fast
  * @since 1.2
  */
 public class FastCosineTransformer implements RealTransformer {
-
-/** Construct a default transformer. */
-public FastCosineTransformer() {
-super();
-}
-
 /**
- * Transform the given real data set.
- * p
- * The formula is Fsubn/sub = (1/2) [fsub0/sub + (-1)supn/sup 
fsubN/sub] +
- *sum;subk=1/subsupN-1/sup fsubk/sub 
cos(pi; nk/N)
- * /p
+ * {@code true} if the orthogonal version of the DCT should be used.
  *
- * @param f the real data array to be transformed
- * @return the real transformed array
- * @throws IllegalArgumentException if any parameters are invalid
+ * @see #create()
+ * @see #createOrthogonal()
  */
-public double[] transform(double[] f) throws IllegalArgumentException {
-return fct(f);
-}
+private final boolean orthogonal;
 
 /**
- * Transform the given real function, sampled on the given interval.
- * p
- * The formula is Fsubn/sub = (1/2) [fsub0/sub + (-1)supn/sup 
fsubN/sub] +
- *sum;subk=1/subsupN-1/sup fsubk/sub 
cos(pi; nk/N)
- * /p
+ * Creates a new instance of this class, with various normalization
+ * conventions.
  *
- * @param f the function to be sampled and transformed
- * @param min the lower bound for the interval
- * @param max the upper bound for the interval
- * @param n the number of sample points
- * @return the real transformed array
- * @throws IllegalArgumentException if any parameters are invalid
+ * @param orthogonal {@code false} if the DCT is emnot/em to be scaled,
+ * {@code true} if it is to be scaled so as to make the transform
+ * orthogonal.
+ * @see #create()
+ * @see #createOrthogonal()
  */
-public double[] transform(UnivariateFunction f,
-  double min, double max, int n)
-throws IllegalArgumentException {
-double[] data = FastFourierTransformer.sample(f, min, max, n);
-return fct(data);
+public FastCosineTransformer(final boolean orthogonal) {
+this.orthogonal = orthogonal;
 }
 
 /**
- * Transform the given real data set.
  * p
- * The formula is Fsubn/sub = radic;(1/2N) [fsub0/sub + 
(-1)supn/sup fsubN/sub] +
- *radic;(2/N) sum;subk=1/subsupN-1/sup 
fsubk/sub cos(pi; nk/N)
+ * Returns a new instance of this class. The returned transformer uses the
+ * normalizing conventions described below.
+ * ul
+ * liForward transform:
+ * ysubn/sub = (1/2) [xsub0/sub + (-1)supn/supxsubN-1/sub]
+ * + sum;subk=1/subsupN-2/sup
+ * xsubk/sub cos[pi; nk / (N - 1)],/li
+ * liInverse transform:
+ * xsubk/sub = [1 / (N - 1)] [ysub0/sub
+ * + (-1)supk/supysubN-1/sub]
+ * + [2 / (N - 1)] sum;subn=1/subsupN-2/sup
+ * ysubn/sub cos[pi; nk / (N - 1)],/li
+ * /ul
+ * where N is the size of the data sample.
  * /p
  *
- * @param f the real data array to be transformed
- * @return the real transformed array
- * @throws IllegalArgumentException if any parameters are invalid
+ * @return a new DCT transformer, with standard normalizing conventions
  */
-public double[] transform2(double[] f) throws IllegalArgumentException {
-
-double scalingCoefficient = FastMath.sqrt(2.0 / (f.length - 1));
-return FastFourierTransformer.scaleArray(fct(f), scalingCoefficient);
+public static FastCosineTransformer create() {
+return new FastCosineTransformer(false);
 }
 
 /**
- * Transform the given real function, sampled on the given interval.
  * p
- * The formula is Fsubn/sub = radic;(1/2N) [fsub0/sub + 
(-1)supn/sup