svn commit: r1504038 - in /commons/sandbox/openpgp/trunk: pom.xml src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSignatureVerifier.java src/main/java/org/apache/commons/openpgp/B
Author: ebourg
Date: Wed Jul 17 08:00:32 2013
New Revision: 1504038
URL: http://svn.apache.org/r1504038
Log:
Upgrade to Bouncy Castle 1.49 and replace the deprecated methods, thanks to
Dennis Kieselhorst (SANDBOX-459)
Modified:
commons/sandbox/openpgp/trunk/pom.xml
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSignatureVerifier.java
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSigner.java
Modified: commons/sandbox/openpgp/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/pom.xml?rev=1504038r1=1504037r2=1504038view=diff
==
--- commons/sandbox/openpgp/trunk/pom.xml (original)
+++ commons/sandbox/openpgp/trunk/pom.xml Wed Jul 17 08:00:32 2013
@@ -16,7 +16,7 @@
dependency
groupIdorg.bouncycastle/groupId
artifactIdbcpg-jdk15on/artifactId
- version1.48/version
+ version1.49/version
/dependency
dependency
groupIdjunit/groupId
Modified:
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSignatureVerifier.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSignatureVerifier.java?rev=1504038r1=1504037r2=1504038view=diff
==
---
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSignatureVerifier.java
(original)
+++
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSignatureVerifier.java
Wed Jul 17 08:00:32 2013
@@ -19,7 +19,6 @@ package org.apache.commons.openpgp;
import java.io.IOException;
import java.io.InputStream;
-import java.security.NoSuchProviderException;
import java.security.Security;
import java.security.SignatureException;
@@ -31,6 +30,7 @@ import org.bouncycastle.openpgp.PGPPubli
import org.bouncycastle.openpgp.PGPSignature;
import org.bouncycastle.openpgp.PGPSignatureList;
import org.bouncycastle.openpgp.PGPUtil;
+import
org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
/**
* Bouncy Castle implementation of the OpenPGP signer.
@@ -106,13 +106,7 @@ public class BouncyCastleOpenPgpStreamin
+ Long.toHexString( sig.getKeyID() ).toUpperCase() + ' in
public key ring );
}
-sig.initVerify( key, BC );
-}
-catch ( NoSuchProviderException e )
-{
-throw new OpenPgpException(
-Unable to find the correct provider
for PGP - check that the Bouncy Castle provider is correctly installed,
-e );
+sig.init(new
JcaPGPContentVerifierBuilderProvider().setProvider(BC), key);
}
catch ( PGPException e )
{
Modified:
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSigner.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSigner.java?rev=1504038r1=1504037r2=1504038view=diff
==
---
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSigner.java
(original)
+++
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleOpenPgpStreamingSigner.java
Wed Jul 17 08:00:32 2013
@@ -19,19 +19,20 @@ package org.apache.commons.openpgp;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.BCPGOutputStream;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPrivateKey;
import org.bouncycastle.openpgp.PGPSecretKey;
import org.bouncycastle.openpgp.PGPSignature;
import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import
org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import
org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
import java.security.Security;
import java.security.SignatureException;
@@ -90,21 +91,12 @@ public class BouncyCastleOpenPgpStreamin
{
throw new OpenPgpException( The key with id ' + keyId + '
was not found in the secret keyring. );
svn commit: r1504086 - /commons/proper/imaging/trunk/pom.xml
Author: olamy Date: Wed Jul 17 12:17:07 2013 New Revision: 1504086 URL: http://svn.apache.org/r1504086 Log: use last parent pom Modified: commons/proper/imaging/trunk/pom.xml Modified: commons/proper/imaging/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1504086r1=1504085r2=1504086view=diff == --- commons/proper/imaging/trunk/pom.xml (original) +++ commons/proper/imaging/trunk/pom.xml Wed Jul 17 12:17:07 2013 @@ -28,7 +28,7 @@ parent groupIdorg.apache.commons/groupId artifactIdcommons-parent/artifactId -version28/version +version31/version /parent groupIdorg.apache.commons/groupId @@ -45,8 +45,8 @@ urlhttp://commons.apache.org/proper/commons-imaging//url properties -maven.compile.source1.5/maven.compile.source -maven.compile.target1.5/maven.compile.target +maven.compiler.source1.5/maven.compiler.source +maven.compiler.target1.5/maven.compiler.target commons.componentidimaging/commons.componentid commons.release.version1.0/commons.release.version commons.rc.versionRC4/commons.rc.version
svn commit: r1504089 - /commons/proper/imaging/trunk/pom.xml
Author: olamy Date: Wed Jul 17 12:21:13 2013 New Revision: 1504089 URL: http://svn.apache.org/r1504089 Log: oups last parent is 32 Modified: commons/proper/imaging/trunk/pom.xml Modified: commons/proper/imaging/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1504089r1=1504088r2=1504089view=diff == --- commons/proper/imaging/trunk/pom.xml (original) +++ commons/proper/imaging/trunk/pom.xml Wed Jul 17 12:21:13 2013 @@ -28,7 +28,7 @@ parent groupIdorg.apache.commons/groupId artifactIdcommons-parent/artifactId -version31/version +version32/version /parent groupIdorg.apache.commons/groupId
svn commit: r1504154 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip: UnicodeCommentExtraField.java UnicodePathExtraField.java Zip64ExtendedInformationExtra
Author: bodewig
Date: Wed Jul 17 14:37:22 2013
New Revision: 1504154
URL: http://svn.apache.org/r1504154
Log:
Remove direct citations form APPNOTE.TXT in javadocs, obey to section
1.4.2 in http://www.pkware.com/documents/casestudies/APPNOTE.TXT
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java?rev=1504154r1=1504153r2=1504154view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
Wed Jul 17 14:37:22 2013
@@ -24,15 +24,10 @@ package org.apache.commons.compress.arch
* pStores the UTF-8 version of the file comment as stored in the
* central directory header./p
*
- * pre
- * Value SizeDescription
- * - ---
- * (UCom) 0x6375Short tag for this extra block type (uc)
- * TSize Short total data size for this block
- * Version 1 byte version of this extra field, currently 1
- * ComCRC32 4 bytes Comment Field CRC32 Checksum
- * UnicodeComVariableUTF-8 version of the entry comment
- * /pre
+ * pSee {@link
+ * http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.6.8}./p
+ *
* @NotThreadSafe super-class is not thread-safe
*/
public class UnicodeCommentExtraField extends AbstractUnicodeExtraField {
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java?rev=1504154r1=1504153r2=1504154view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
Wed Jul 17 14:37:22 2013
@@ -24,15 +24,9 @@ package org.apache.commons.compress.arch
* pStores the UTF-8 version of the file name field as stored in the
* local header and central directory header./p
*
- * pre
- * Value SizeDescription
- * - ---
- * (UPath) 0x7075Short tag for this extra block type (up)
- * TSize Short total data size for this block
- * Version 1 byte version of this extra field, currently 1
- * NameCRC32 4 bytes File Name Field CRC32 Checksum
- * UnicodeName VariableUTF-8 version of the entry File Name
- * /pre
+ * pSee {@link
+ * http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.6.9}./p
* @NotThreadSafe super-class is not thread-safe
*/
public class UnicodePathExtraField extends AbstractUnicodeExtraField {
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java?rev=1504154r1=1504153r2=1504154view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
Wed Jul 17 14:37:22 2013
@@ -27,42 +27,9 @@ import static org.apache.commons.compres
* Holds size and other extended information for entries that use Zip64
* features.
*
- * pFrom {@link http://www.pkware.com/documents/casestudies/APPNOTE.TXT
PKWARE's APPNOTE.TXT}
- * pre
- * Zip64 Extended Information Extra Field (0x0001):
- *
- * The following is the layout of the zip64 extended
- *
svn commit: r1504155 - in /commons/proper/compress/branches/LZMA: ./ src/changes/ src/main/java/org/apache/commons/compress/archivers/tar/ src/main/java/org/apache/commons/compress/archivers/zip/
Author: bodewig
Date: Wed Jul 17 14:39:09 2013
New Revision: 1504155
URL: http://svn.apache.org/r1504155
Log:
merge from trunk
Modified:
commons/proper/compress/branches/LZMA/ (props changed)
commons/proper/compress/branches/LZMA/NOTICE.txt
commons/proper/compress/branches/LZMA/src/changes/changes.xml
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/
(props changed)
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
(contents, props changed)
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/zip/
(props changed)
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Propchange: commons/proper/compress/branches/LZMA/
--
Merged /commons/proper/compress/trunk:r1500025-1504154
Modified: commons/proper/compress/branches/LZMA/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/NOTICE.txt?rev=1504155r1=1504154r2=1504155view=diff
==
--- commons/proper/compress/branches/LZMA/NOTICE.txt (original)
+++ commons/proper/compress/branches/LZMA/NOTICE.txt Wed Jul 17 14:39:09 2013
@@ -4,8 +4,6 @@ Copyright 2002-2013 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-
The files in the package org.apache.commons.compress.archivers.sevenz
were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/),
which has been placed in the public domain:
Modified: commons/proper/compress/branches/LZMA/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/src/changes/changes.xml?rev=1504155r1=1504154r2=1504155view=diff
==
--- commons/proper/compress/branches/LZMA/src/changes/changes.xml (original)
+++ commons/proper/compress/branches/LZMA/src/changes/changes.xml Wed Jul 17
14:39:09 2013
@@ -76,6 +76,14 @@ The action type attribute can be add,u
The class now also provides two new methods to obtain all
entries of a given name rather than just the first one.
/action
+ action type=update date=2013-07-08 issue=COMPRESS-232
+ due-to=BELUGA BEHR
+Readabilty patch to TarArchiveInputStream.
+ /action
+ action type=update date=2013-07-08 issue=COMPRESS-233
+ due-to=BELUGA BEHR
+Performance and readability patch to TarBuffer.
+ /action
/release
release version=1.5 date=2013-03-14
description=Release 1.5
Propchange:
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/
--
Merged
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:r1500025-1504154
Modified:
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=1504155r1=1504154r2=1504155view=diff
==
---
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
(original)
+++
commons/proper/compress/branches/LZMA/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
Wed Jul 17 14:39:09 2013
@@ -233,7 +233,8 @@ public class TarArchiveInputStream exten
byte[] headerBuf = getRecord();
-if (hasHitEOF) {
+if (headerBuf == null) {
+/* hit EOF */
currEntry = null;
return null;
}
@@ -324,28 +325,27 @@ public class TarArchiveInputStream exten
* over any remaining data in the current entry, if there
* is one, and place the input stream at the header of the
* next entry.
- * If there are no more entries in the archive, null will
- * be returned to indicate that the end of the archive has
-
svn commit: r869843 - in /websites/production/commons/content/proper/commons-compress: ./ apidocs/ apidocs/org/apache/commons/compress/archivers/ apidocs/org/apache/commons/compress/archivers/ar/ apid
Author: bodewig Date: Wed Jul 17 14:52:04 2013 New Revision: 869843 Log: Update compress' site [This commit notification would consist of 72 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1504314 - in /commons/proper/math/trunk: build.xml pom.xml src/changes/changes.xml src/site/xdoc/developers.xml
Author: psteitz
Date: Wed Jul 17 22:42:07 2013
New Revision: 1504314
URL: http://svn.apache.org/r1504314
Log:
Enabled LaTeX expressions in javadoc via MathJax. JIRA: MATH-1006.
Modified:
commons/proper/math/trunk/build.xml
commons/proper/math/trunk/pom.xml
commons/proper/math/trunk/src/changes/changes.xml
commons/proper/math/trunk/src/site/xdoc/developers.xml
Modified: commons/proper/math/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/build.xml?rev=1504314r1=1504313r2=1504314view=diff
==
--- commons/proper/math/trunk/build.xml (original)
+++ commons/proper/math/trunk/build.xml Wed Jul 17 22:42:07 2013
@@ -247,6 +247,7 @@
doctitle=lt;h1gt;${component.title}
${component.version}lt;/h1gt;
windowtitle=${component.title} ${component.version}
bottom=Copyright (c) 2003-${current.year} Apache Software
Foundation
+ additionalparam=-header apos;lt;script
type=quot;text/javascriptquot;
src=quot;http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMMLquot;gt;lt;/scriptgt;apos;;
classpathref=compile.classpath
link href=http://java.sun.com/j2se/1.5.0/docs/api//
/javadoc
Modified: commons/proper/math/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/pom.xml?rev=1504314r1=1504313r2=1504314view=diff
==
--- commons/proper/math/trunk/pom.xml (original)
+++ commons/proper/math/trunk/pom.xml Wed Jul 17 22:42:07 2013
@@ -455,7 +455,15 @@
/execution
/executions
/plugin
-
+ !-- MathJax --
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+version2.9.1/version
+configuration
+ additionalparam-header apos;lt;script
type=quot;text/javascriptquot;
src=quot;http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMMLquot;gt;lt;/scriptgt;apos;/additionalparam
+/configuration
+ /plugin
/plugins
/build
@@ -578,6 +586,15 @@
/reportSet
/reportSets
/plugin
+ !-- MathJax --
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+version2.9.1/version
+configuration
+ additionalparam-header apos;lt;script
type=quot;text/javascriptquot;
src=quot;http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMMLquot;gt;lt;/scriptgt;apos;/additionalparam
+/configuration
+ /plugin
/plugins
/reporting
/project
Modified: commons/proper/math/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/changes/changes.xml?rev=1504314r1=1504313r2=1504314view=diff
==
--- commons/proper/math/trunk/src/changes/changes.xml (original)
+++ commons/proper/math/trunk/src/changes/changes.xml Wed Jul 17 22:42:07 2013
@@ -51,6 +51,9 @@ If the output is not quite correct, chec
/properties
body
release version=x.y date=TBD description=TBD
+ action dev=psteitz type=update issue=MATH-1006
+Enabled LaTeX expressions in javadoc via MathJax.
+ /action
action dev=sebb type=add issue=MATH-1000
Add mode function to Frequency class.
/action
Modified: commons/proper/math/trunk/src/site/xdoc/developers.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/site/xdoc/developers.xml?rev=1504314r1=1504313r2=1504314view=diff
==
--- commons/proper/math/trunk/src/site/xdoc/developers.xml (original)
+++ commons/proper/math/trunk/src/site/xdoc/developers.xml Wed Jul 17 22:42:07
2013
@@ -175,6 +175,17 @@
External references or full statements of definitions for all
mathematical
terms used in component documentation imust/i be provided./li
li
+ Commons math javadoc generation now supports embedded LaTeX formulas via
the
+ a href=http://www.mathjax.org;MathJax/a javascript display engine.
To
+ embed mathematical expressions formatted in LaTeX in javadoc, simply
surround
+ the expression to be formatted with either #92;( and #92;) for inline
+ formulas, or #92;[ and #92;] to have the formula appear on a separate
line.
+ For example, #92;(a^2 + b^2 = c^2#92;) will render an in-line formula
+ saying thqt (a, b, c) is Pythagorean triplet. Using #92;[ and #92;] on
+ the ends will render the same formula on a separate line. See the
MathJax
+ and LaTex documentation for details on how to represent formulas and
+ escape special characters./li
+ li
Implementations ishould/i use standard algorithms and
references
