svn commit: r424383 - in /incubator/harmony/enhanced/classlib/trunk/modules: luni/src/main/java/org/apache/harmony/luni/util/ security/src/main/java/common/java/security/ security/src/main/java/common/org/apache/harmony/security/utils/ x-net/META-INF/ ...

[te...@apache.org]

Author: tellison
Date: Fri Jul 21 09:41:38 2006
New Revision: 424383

URL: http://svn.apache.org/viewvc?rev=424383&view=rev
Log:
Move general utility class from SECURITY to LUNI.
Fix up X-NET manifest imports for SSL requirements.

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
      - copied, changed from r424242, incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java (from r424242, incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java&r1=424242&r2=424383&rev=424383&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/utils/TwoKeyHashMap.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java Fri Jul 21 09:41:38 2006
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.security.utils;
+package org.apache.harmony.luni.util;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java?rev=424383&r1=424382&r2=424383&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java Fri Jul 21 09:41:38 2006
@@ -35,8 +35,8 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.harmony.luni.util.TwoKeyHashMap;
 import org.apache.harmony.security.fortress.Services;
-import org.apache.harmony.security.utils.TwoKeyHashMap;
 
 public abstract class Provider extends Properties {
     private static final long serialVersionUID = -4298000515446427739L;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/META-INF/MANIFEST.MF?rev=424383&r1=424382&r2=424383&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/META-INF/MANIFEST.MF Fri Jul 21 09:41:38 2006
@@ -7,13 +7,20 @@
 Eclipse-JREBundle: true
 Import-Package: java.io,
  java.lang,
+ java.math,
  java.net,
  java.nio,
  java.security,
  java.security.cert,
+ java.security.interfaces,
+ java.security.spec,
  java.util,
+ javax.crypto,
+ javax.crypto.interfaces,
+ javax.crypto.spec,
  javax.security.auth.x500,
  javax.security.cert,
+ org.apache.harmony.luni.util,
  org.apache.harmony.security.fortress,
  org.apache.harmony.security.tests.support;hy_usage=test;resolution:=optional,
  org.apache.harmony.testframework.serialization;hy_usage=test;resolution:=optional

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java?rev=424383&r1=424382&r2=424383&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java Fri Jul 21 09:41:38 2006
@@ -38,7 +38,7 @@
 import javax.net.ssl.SSLSessionBindingListener;
 import javax.net.ssl.SSLSessionContext;
 
-import org.apache.harmony.security.utils.TwoKeyHashMap;
+import org.apache.harmony.luni.util.TwoKeyHashMap;
 import org.apache.harmony.xnet.provider.jsse.SSLSessionContextImpl;
 
 /**