You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/03/20 13:46:34 UTC
svn commit: r1458807 - in /commons/sandbox/openpgp/trunk: ./
src/main/java/org/apache/commons/openpgp/
src/main/java/org/apache/commons/openpgp/ant/
src/test/java/org/apache/commons/openpgp/
Author: ebourg
Date: Wed Mar 20 12:46:33 2013
New Revision: 1458807
URL: http://svn.apache.org/r1458807
Log:
Upgrade to Java 5
Modified:
commons/sandbox/openpgp/trunk/pom.xml
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleKeyRing.java
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/OpenPgpException.java
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/UnknownKeyException.java
commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/ant/OpenPgpSignerTask.java
commons/sandbox/openpgp/trunk/src/test/java/org/apache/commons/openpgp/BouncyCastleKeyRingTest.java
Modified: commons/sandbox/openpgp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/pom.xml?rev=1458807&r1=1458806&r2=1458807&view=diff
==============================================================================
--- commons/sandbox/openpgp/trunk/pom.xml (original)
+++ commons/sandbox/openpgp/trunk/pom.xml Wed Mar 20 12:46:33 2013
@@ -12,7 +12,6 @@
<url>http://commons.apache.org/sandbox/openpgp/</url>
<inceptionYear>2005</inceptionYear>
<dependencies>
- <!-- we need an optional dep on JCE for JDK 1.3 and lower -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk12</artifactId>
@@ -70,8 +69,8 @@
<!-- Compiler source and target JVM (see parent pom) -->
<properties>
- <maven.compile.source>1.3</maven.compile.source>
- <maven.compile.target>1.3</maven.compile.target>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
<commons.componentid>openpgp</commons.componentid>
<commons.jira.componentid>12311187</commons.jira.componentid>
</properties>
Modified: commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleKeyRing.java
URL: http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleKeyRing.java?rev=1458807&r1=1458806&r2=1458807&view=diff
==============================================================================
--- commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleKeyRing.java (original)
+++ commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/BouncyCastleKeyRing.java Wed Mar 20 12:46:33 2013
@@ -36,14 +36,13 @@ import org.bouncycastle.openpgp.PGPUtil;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @todo password is not secure
*/
-public class BouncyCastleKeyRing
- implements KeyRing
+public class BouncyCastleKeyRing implements KeyRing
{
- private final Map pgpSec = new HashMap();
+ private final Map<Long, PGPSecretKey> pgpSec = new HashMap<Long, PGPSecretKey>();
private char[] password;
- private final Map pgpPub = new HashMap();
+ private final Map<Long, PGPPublicKey> pgpPub = new HashMap<Long, PGPPublicKey>();
private static final long MASK = 0xFFFFFFFFL;
@@ -73,7 +72,7 @@ public class BouncyCastleKeyRing
}
PGPPublicKeyRing keyRing = (PGPPublicKeyRing) obj;
- Long key = new Long( keyRing.getPublicKey().getKeyID() & MASK );
+ long key = keyRing.getPublicKey().getKeyID() & MASK;
pgpPub.put( key, keyRing.getPublicKey() );
}
@@ -93,7 +92,7 @@ public class BouncyCastleKeyRing
}
PGPSecretKeyRing pgpSecret = (PGPSecretKeyRing) obj;
- Long key = new Long( pgpSecret.getSecretKey().getKeyID() & MASK );
+ long key = pgpSecret.getSecretKey().getKeyID() & MASK;
pgpSec.put( key, pgpSecret.getSecretKey() );
}
@@ -108,21 +107,21 @@ public class BouncyCastleKeyRing
public PGPSecretKey getSecretKey( String keyId )
{
- return (PGPSecretKey) pgpSec.get( Long.valueOf( keyId, 16 ) );
+ return pgpSec.get( Long.valueOf( keyId, 16 ) );
}
public PGPPublicKey getPublicKey( String keyId )
{
- return (PGPPublicKey) pgpPub.get( Long.valueOf( keyId, 16 ) );
+ return pgpPub.get( Long.valueOf( keyId, 16 ) );
}
public PGPSecretKey getSecretKey( long keyId )
{
- return (PGPSecretKey) pgpSec.get( new Long( keyId & MASK ) );
+ return pgpSec.get(keyId & MASK);
}
public PGPPublicKey getPublicKey( long keyId )
{
- return (PGPPublicKey) pgpPub.get( new Long( keyId & MASK ) );
+ return pgpPub.get(keyId & MASK);
}
}
Modified: commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/OpenPgpException.java
URL: http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/OpenPgpException.java?rev=1458807&r1=1458806&r2=1458807&view=diff
==============================================================================
--- commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/OpenPgpException.java (original)
+++ commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/OpenPgpException.java Wed Mar 20 12:46:33 2013
@@ -22,11 +22,8 @@ package org.apache.commons.openpgp;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class OpenPgpException
- extends Exception
+public class OpenPgpException extends Exception
{
- private Throwable cause;
-
public OpenPgpException( String message )
{
super( message );
@@ -34,12 +31,6 @@ public class OpenPgpException
public OpenPgpException( String message, Throwable cause )
{
- super( message );
- this.cause = cause;
- }
-
- public Throwable getCause()
- {
- return cause;
+ super( message , cause );
}
}
Modified: commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/UnknownKeyException.java
URL: http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/UnknownKeyException.java?rev=1458807&r1=1458806&r2=1458807&view=diff
==============================================================================
--- commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/UnknownKeyException.java (original)
+++ commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/UnknownKeyException.java Wed Mar 20 12:46:33 2013
@@ -22,8 +22,7 @@ package org.apache.commons.openpgp;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class UnknownKeyException
- extends OpenPgpException
+public class UnknownKeyException extends OpenPgpException
{
public UnknownKeyException( String message )
{
Modified: commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/ant/OpenPgpSignerTask.java
URL: http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/ant/OpenPgpSignerTask.java?rev=1458807&r1=1458806&r2=1458807&view=diff
==============================================================================
--- commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/ant/OpenPgpSignerTask.java (original)
+++ commons/sandbox/openpgp/trunk/src/main/java/org/apache/commons/openpgp/ant/OpenPgpSignerTask.java Wed Mar 20 12:46:33 2013
@@ -39,7 +39,7 @@ public class OpenPgpSignerTask extends T
private File pubring;
private String password;
private String keyId;
- private Collection tosign = new ArrayList();
+ private Collection<FileSet> tosign = new ArrayList<FileSet>();
private File artefact;
private boolean asciiarmor = true;
private Mapper mapperElement;
@@ -147,9 +147,8 @@ public class OpenPgpSignerTask extends T
dosign(keyRing, artefact);
}
if (tosign.size() != 0) {
- for (Iterator it = tosign.iterator(); it.hasNext(); ) {
- FileSet fs = (FileSet) it.next();
- dosign(keyRing, fs);
+ for (FileSet fileset : tosign) {
+ dosign(keyRing, fileset);
}
}
FileUtils.close(secStream);
@@ -158,9 +157,8 @@ public class OpenPgpSignerTask extends T
private void dosign(KeyRing keyRing, FileSet fs) {
DirectoryScanner ds = fs.getDirectoryScanner(getProject());
String[] artefacts = ds.getIncludedFiles();
- for (int counter = 0; counter < artefacts.length; counter++) {
- dosign(keyRing,
- new File(fs.getDir(getProject()), artefacts[counter]), fs.getDir(getProject()), artefacts[counter]);
+ for (String artefact : artefacts) {
+ dosign(keyRing, new File(fs.getDir(getProject()), artefact), fs.getDir(getProject()), artefact);
}
}
private void dosign(KeyRing keyRing, File oneartefact) {
Modified: commons/sandbox/openpgp/trunk/src/test/java/org/apache/commons/openpgp/BouncyCastleKeyRingTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/openpgp/trunk/src/test/java/org/apache/commons/openpgp/BouncyCastleKeyRingTest.java?rev=1458807&r1=1458806&r2=1458807&view=diff
==============================================================================
--- commons/sandbox/openpgp/trunk/src/test/java/org/apache/commons/openpgp/BouncyCastleKeyRingTest.java (original)
+++ commons/sandbox/openpgp/trunk/src/test/java/org/apache/commons/openpgp/BouncyCastleKeyRingTest.java Wed Mar 20 12:46:33 2013
@@ -28,8 +28,7 @@ import java.io.IOException;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class BouncyCastleKeyRingTest
- extends TestCase
+public class BouncyCastleKeyRingTest extends TestCase
{
private String[] pubKeyId = { "A7D16BD4", "84C9113", "E6C2AB68" };
@@ -39,8 +38,7 @@ public class BouncyCastleKeyRingTest
private static final String PASSWORD = "cop";
- protected void setUp()
- throws Exception
+ protected void setUp() throws Exception
{
super.setUp();
@@ -49,21 +47,19 @@ public class BouncyCastleKeyRingTest
getClass().getResourceAsStream( "/pubring.gpg" ), PASSWORD.toCharArray() );
}
- public void testPublicKeys()
- throws OpenPgpException, IOException
+ public void testPublicKeys() throws OpenPgpException, IOException
{
- for ( int i = 0; i < pubKeyId.length; i++ )
+ for (String keyId : pubKeyId)
{
- assertNotNull( "Unable to find key " + pubKeyId[i], keyRing.getPublicKey( pubKeyId[i] ) );
+ assertNotNull("Unable to find key " + keyId, keyRing.getPublicKey(keyId));
}
}
- public void testSecretKeys()
- throws OpenPgpException, IOException
+ public void testSecretKeys() throws OpenPgpException, IOException
{
- for ( int i = 0; i < secKeyId.length; i++ )
+ for (String keyId : secKeyId)
{
- assertNotNull( "Unable to find key " + secKeyId[i], keyRing.getSecretKey( secKeyId[i] ) );
+ assertNotNull("Unable to find key " + keyId, keyRing.getSecretKey(keyId));
}
}
}