harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r489673 - in /harmony/enhanced/classlib/trunk/modules: crypto/META-INF/ crypto/src/main/java/javax/crypto/ crypto/src/main/java/org/apache/harmony/crypto/utils/ crypto/src/test/impl/java/org/apache/harmony/crypto/utils/ security/META-INF/ s...
Date Fri, 22 Dec 2006 15:24:57 GMT
Author: tellison
Date: Fri Dec 22 07:24:56 2006
New Revision: 489673

URL: http://svn.apache.org/viewvc?view=rev&rev=489673
Log:
Move AlgNameMapper utility from crypto to security (to reduce module coupling).

Added:
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
      - copied, changed from r489666, harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
Removed:
    harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
Modified:
    harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
    harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
    harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AlgorithmIdentifier.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
    harmony/enhanced/classlib/trunk/modules/tools/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java

Modified: harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF Fri Dec 22 07:24:56
2006
@@ -24,10 +24,10 @@
  org.apache.harmony.security.asn1,
  org.apache.harmony.security.fortress,
  org.apache.harmony.security.tests.support;hy_usage=test;resolution:=optional,
+ org.apache.harmony.security.utils,
  org.apache.harmony.security.x509,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
  tests.support.resource;hy_usage=test;resolution:=optional
 Export-Package: javax.crypto,
  javax.crypto.interfaces,
- javax.crypto.spec,
- org.apache.harmony.crypto.utils;version="1.0.0"
+ javax.crypto.spec

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
Fri Dec 22 07:24:56 2006
@@ -34,7 +34,6 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 
 import org.apache.harmony.crypto.internal.nls.Messages;
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.asn1.ASN1Any;
 import org.apache.harmony.security.asn1.ASN1Implicit;
 import org.apache.harmony.security.asn1.ASN1Integer;
@@ -42,6 +41,7 @@
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1SetOf;
 import org.apache.harmony.security.asn1.ASN1Type;
+import org.apache.harmony.security.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.AlgorithmIdentifier;
 
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/utils/AlgNameMapperTest.java
Fri Dec 22 07:24:56 2006
@@ -17,6 +17,8 @@
 
 package org.apache.harmony.crypto.utils;
 
+import org.apache.harmony.security.utils.AlgNameMapper;
+
 import junit.framework.TestCase;
 
 public class AlgNameMapperTest extends TestCase {

Modified: harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF Fri Dec 22 07:24:56
2006
@@ -29,7 +29,6 @@
  javax.security.auth.callback,
  javax.security.auth.login,
  javax.security.auth.x500,
- org.apache.harmony.crypto.utils,
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional,
@@ -48,7 +47,7 @@
  org.apache.harmony.security.pkcs7;version="1.0.0",
  org.apache.harmony.security.provider.cert;version="1.0.0",
  org.apache.harmony.security.tests.support;hy_usage=test;version="1.0.0";mandatory:=hy_usage,
- org.apache.harmony.security.utils;version="1.0.0";x-friends:="org.apache.harmony.archive,org.apache.harmony.luni,org.apache.harmony.auth",
+ org.apache.harmony.security.utils;version="1.0.0",
  org.apache.harmony.security.x501;version="1.0.0",
  org.apache.harmony.security.x509;version="1.0.0",
  org.apache.harmony.security.x509.tsp;version="1.0.0"

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
Fri Dec 22 07:24:56 2006
@@ -45,8 +45,8 @@
 
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.internal.nls.Messages;
+import org.apache.harmony.security.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.CertificateList;
 import org.apache.harmony.security.x509.Extension;
 import org.apache.harmony.security.x509.Extensions;

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
Fri Dec 22 07:24:56 2006
@@ -45,8 +45,8 @@
 
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.internal.nls.Messages;
+import org.apache.harmony.security.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.Certificate;
 import org.apache.harmony.security.x509.Extension;
 import org.apache.harmony.security.x509.Extensions;

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
Fri Dec 22 07:24:56 2006
@@ -42,6 +42,7 @@
 
 import org.apache.harmony.security.provider.crypto.DSAPrivateKeyImpl;
 import org.apache.harmony.security.provider.crypto.DSAPublicKeyImpl;
+import org.apache.harmony.security.utils.AlgNameMapper;
 
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Integer;
@@ -53,7 +54,6 @@
 
 import org.apache.harmony.security.internal.nls.Messages;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 
 public class DSAKeyFactoryImpl extends KeyFactorySpi {
 

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
Fri Dec 22 07:24:56 2006
@@ -35,11 +35,11 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.PrivateKeyImpl;
 import org.apache.harmony.security.asn1.ASN1Integer;
 import org.apache.harmony.security.internal.nls.Messages;
 import org.apache.harmony.security.pkcs8.PrivateKeyInfo;
+import org.apache.harmony.security.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.AlgorithmIdentifier;
 
 /**

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
Fri Dec 22 07:24:56 2006
@@ -40,6 +40,7 @@
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
 
+import org.apache.harmony.security.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.AlgorithmIdentifier;
 import org.apache.harmony.security.x509.SubjectPublicKeyInfo;
 
@@ -52,7 +53,6 @@
 //import org.apache.harmony.security.asn1.ASN1OctetString;
 
 import org.apache.harmony.security.internal.nls.Messages;
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 
 import org.apache.harmony.security.PublicKeyImpl;
 

Copied: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
(from r489666, harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java?view=diff&rev=489673&p1=harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java&r1=489666&p2=harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
Fri Dec 22 07:24:56 2006
@@ -20,7 +20,7 @@
 * @version $Revision$
 */
 
-package org.apache.harmony.crypto.utils;
+package org.apache.harmony.security.utils;
 
 import java.security.Provider;
 import java.security.Security;

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AlgorithmIdentifier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AlgorithmIdentifier.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AlgorithmIdentifier.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/AlgorithmIdentifier.java
Fri Dec 22 07:24:56 2006
@@ -24,13 +24,13 @@
 
 import java.util.Arrays;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.asn1.ASN1Any;
 import org.apache.harmony.security.asn1.ASN1Oid;
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
 import org.apache.harmony.security.asn1.ObjectIdentifier;
+import org.apache.harmony.security.utils.AlgNameMapper;
 
 
 /**

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
Fri Dec 22 07:24:56 2006
@@ -26,12 +26,12 @@
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.asn1.ASN1BitString;
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Type;
 import org.apache.harmony.security.asn1.BerInputStream;
 import org.apache.harmony.security.asn1.BitString;
+import org.apache.harmony.security.utils.AlgNameMapper;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work

Modified: harmony/enhanced/classlib/trunk/modules/tools/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/META-INF/MANIFEST.MF?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/META-INF/MANIFEST.MF Fri Dec 22 07:24:56
2006
@@ -25,13 +25,13 @@
  java.util.logging,
  javax.crypto,
  javax.security.auth.x500,
- org.apache.harmony.crypto.utils;version="1.0.0",
  org.apache.harmony.kernel.vm,
  org.apache.harmony.luni.util,
  org.apache.harmony.security.asn1;version="1.0.0",
  org.apache.harmony.security.pkcs10;version="1.0.0",
  org.apache.harmony.security.pkcs7;version="1.0.0",
  org.apache.harmony.security.provider.cert;version="1.0.0",
+ org.apache.harmony.security.utils;version="1.0.0",
  org.apache.harmony.security.x501;version="1.0.0",
  org.apache.harmony.security.x509;version="1.0.0",
  org.apache.harmony.security.x509.tsp;version="1.0.0"

Modified: harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java?view=diff&rev=489673&r1=489672&r2=489673
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
Fri Dec 22 07:24:56 2006
@@ -42,8 +42,8 @@
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
-import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.provider.cert.X509CertImpl;
+import org.apache.harmony.security.utils.AlgNameMapper;
 import org.apache.harmony.security.x501.Name;
 import org.apache.harmony.security.x509.AlgorithmIdentifier;
 import org.apache.harmony.security.x509.BasicConstraints;



Mime
View raw message