You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/03/08 16:25:56 UTC
svn commit: r384239 - in /incubator/harmony/enhanced/classlib/trunk/modules:
archive/META-INF/MANIFEST.MF
archive/src/main/java/java/util/jar/JarVerifier.java
luni/src/main/java/com/ibm/oti/util/JarUtils.java
security/META-INF/MANIFEST.MF
Author: tellison
Date: Wed Mar 8 07:25:55 2006
New Revision: 384239
URL: http://svn.apache.org/viewcvs?rev=384239&view=rev
Log:
Archive should pick up JarUtils from security module, not luni.
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/JarUtils.java
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java
incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF?rev=384239&r1=384238&r2=384239&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF Wed Mar 8 07:25:55 2006
@@ -16,6 +16,7 @@
java.nio,
java.nio.charset,
com.ibm.oti.util,
- org.apache.harmony.luni.util
+ org.apache.harmony.luni.util,
+ org.apache.harmony.security.utils
Export-Package: java.util.jar,
java.util.zip
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java?rev=384239&r1=384238&r2=384239&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java Wed Mar 8 07:25:55 2006
@@ -34,7 +34,8 @@
import org.apache.harmony.luni.util.BASE64Decoder;
-import com.ibm.oti.util.JarUtils;
+import org.apache.harmony.security.utils.JarUtils;
+
import com.ibm.oti.util.Msg;
/**
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF?rev=384239&r1=384238&r2=384239&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/META-INF/MANIFEST.MF Wed Mar 8 07:25:55 2006
@@ -26,4 +26,5 @@
javax.security.auth.x500,
javax.security.cert,
javax.security.sasl,
- org.ietf.jgss
+ org.ietf.jgss,
+ org.apache.harmony.security.utils;version="1.0.0";x-friends:="org.apache.harmony.luni"