harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r391586 - in /incubator/harmony/enhanced/classlib/trunk: make/patternsets/ modules/crypto/META-INF/ modules/crypto/make/common/ modules/crypto/src/main/java/javax/crypto/ modules/crypto/src/main/java/org/apache/harmony/crypto/ modules/crypt...
Date Wed, 05 Apr 2006 11:27:52 GMT
Author: mloenko
Date: Wed Apr  5 04:27:45 2006
New Revision: 391586

URL: http://svn.apache.org/viewcvs?rev=391586&view=rev
Log:
organizing crypto module (putting o.a.h classes to match agreed on layout):
org.apache.harmony.modulename.internal
...
etc.

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/
      - copied from r391527, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/security/x/crypto/utils/
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/internal/
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/internal/NullCipherSpiTest.java
      - copied, changed from r391578, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/security/x/crypto/NullCipherSpi.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/security/x/crypto/utils/
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/PublicKeyImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt Wed Apr  5 04:27:45
2006
@@ -16,5 +16,5 @@
 javax/crypto/interfaces/*
 javax/crypto/spec/*
 
-org/apache/harmony/security/x/crypto/*
-org/apache/harmony/security/x/crypto/utils/*
+org/apache/harmony/crypto/internal/*
+org/apache/harmony/crypto/utils/*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/META-INF/MANIFEST.MF Wed Apr
 5 04:27:45 2006
@@ -18,4 +18,5 @@
  java.util,
 Export-Package: javax.crypto,
  javax.crypto.interfaces,
- javax.crypto.spec
+ javax.crypto.spec,
+ org.apache.harmony.crypto.utils

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Wed Apr
 5 04:27:45 2006
@@ -60,7 +60,7 @@
                     </src>
 
                     <include name="javax/crypto/**/*.java" />
-                    <include name="org/apache/harmony/security/x/crypto/*Test.java" />
+                    <include name="org/apache/harmony/crypto/internal/*Test.java" />
                     <include name="org/apache/harmony/security/test/**/*" />
                     <exclude name="**/SecurityTest.java"/>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
Wed Apr  5 04:27:45 2006
@@ -32,6 +32,7 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 
+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;
@@ -39,7 +40,6 @@
 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.x.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.AlgorithmIdentifier;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/javax/crypto/NullCipher.java
Wed Apr  5 04:27:45 2006
@@ -25,7 +25,7 @@
 import java.security.Key;
 import java.security.SecureRandom;
 
-import org.apache.harmony.security.x.crypto.NullCipherSpi;
+import org.apache.harmony.crypto.internal.NullCipherSpi;
 
 
 /**

Added: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java?rev=391586&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
Wed Apr  5 04:27:45 2006
@@ -0,0 +1,211 @@
+/*
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+* @author Boris V. Kuznetsov
+* @version $Revision$
+*/
+
+package org.apache.harmony.crypto.internal;
+
+import java.nio.ByteBuffer;
+import java.security.AlgorithmParameters;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.CipherSpi;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.ShortBufferException;
+
+/**
+ * CipherSpi implementation for javax.crypto.NullCipher
+ * 
+ */
+public class NullCipherSpi extends CipherSpi {
+
+    /**
+     * See javax.crypto.CipherSpi#engineSetMode(java.lang.String)
+     */
+    public void engineSetMode(String arg0) throws NoSuchAlgorithmException {
+        // Do nothing
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineSetPadding(java.lang.String)
+     */
+    public void engineSetPadding(String arg0) throws NoSuchPaddingException {
+        // Do nothing
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineGetBlockSize()
+     */
+    public int engineGetBlockSize() {
+        return 1;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineGetOutputSize(int)
+     */
+    public int engineGetOutputSize(int inputLen) {
+        return inputLen;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineGetIV()
+     */
+    public byte[] engineGetIV() {
+        return null;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineGetParameters()
+     */
+    public AlgorithmParameters engineGetParameters() {
+        return null;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineInit(int, java.security.Key,
+     * java.security.SecureRandom)
+     */
+    public void engineInit(int opmode, Key key, SecureRandom random)
+            throws InvalidKeyException {
+        // Do nothing
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineInit(int, java.security.Key,
+     * java.security.spec.AlgorithmParameterSpec, java.security.SecureRandom)
+     */
+    public void engineInit(int opmode, Key key, AlgorithmParameterSpec params,
+            SecureRandom random) throws InvalidKeyException,
+            InvalidAlgorithmParameterException {
+        // Do nothing
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineInit(int, java.security.Key,
+     * java.security.AlgorithmParameters, java.security.SecureRandom)
+     */
+    public void engineInit(int opmode, Key key, AlgorithmParameters params,
+            SecureRandom random) throws InvalidKeyException,
+            InvalidAlgorithmParameterException {
+        // Do nothing
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineUpdate(byte[], int, int)
+     */
+    public byte[] engineUpdate(byte[] input, int inputOffset, int inputLen) {
+        if (input == null) {
+            return null;
+        }
+        byte[] result = new byte[inputLen];
+        System.arraycopy(input, inputOffset, result, 0, inputLen);
+        return result;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineUpdate(byte[], int, int, byte[], int)
+     */
+    public int engineUpdate(byte[] input, int inputOffset, int inputLen,
+            byte[] output, int outputOffset) throws ShortBufferException {
+        if (input == null) {
+            return 0;
+        }
+        System.arraycopy(input, inputOffset, output, outputOffset, inputLen);
+        return inputLen;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineUpdate(ByteBuffer, ByteBuffer)
+     */
+    public int engineUpdate(ByteBuffer input, ByteBuffer output)
+            throws ShortBufferException {
+        if (input == null || output == null) {
+            throw new NullPointerException();
+        }
+        int result = input.limit() - input.position();
+        try {
+            output.put(input);
+        } catch (java.nio.BufferOverflowException e) {
+            throw new ShortBufferException("output buffer is too small " + e);
+        }
+        return result;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineDoFinal(byte[], int, int)
+     */
+    public byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)
+            throws IllegalBlockSizeException, BadPaddingException {
+        if (input == null) {
+            return null;
+        }
+        return engineUpdate(input, inputOffset, inputLen);
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineDoFinal(byte[], int, int, byte[], int)
+     */
+    public int engineDoFinal(byte[] input, int inputOffset, int inputLen,
+            byte[] output, int outputOffset) throws ShortBufferException,
+            IllegalBlockSizeException, BadPaddingException {
+        int result = engineUpdate(input, inputOffset, inputLen, output,
+                outputOffset);
+        return result;
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineDoFinal(ByteBuffer, ByteBuffer)
+     */
+    public int engineDoFinal(ByteBuffer input, ByteBuffer output)
+            throws ShortBufferException, IllegalBlockSizeException,
+            BadPaddingException {
+        return engineUpdate(input, output);
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineWrap(Key)
+     */
+    public byte[] engineWrap(Key key) throws IllegalBlockSizeException,
+            InvalidKeyException {
+        throw new UnsupportedOperationException("Wrap");
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineUnwrap(byte[], String, int)
+     */
+    public Key engineUnwrap(byte[] wrappedKey, String wrappedKeyAlgorithm,
+            int wrappedKeyType) throws InvalidKeyException,
+            NoSuchAlgorithmException {
+        throw new UnsupportedOperationException("Unwrap");
+    }
+
+    /**
+     * See javax.crypto.CipherSpi#engineGetKeySize(Key)
+     */
+    public int engineGetKeySize(Key key) throws InvalidKeyException {
+        throw new UnsupportedOperationException("GetKeySize");
+    }
+}
\ No newline at end of file

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java?rev=391586&r1=391527&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/main/java/org/apache/harmony/crypto/utils/AlgNameMapper.java
Wed Apr  5 04:27:45 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package org.apache.harmony.security.x.crypto.utils;
+package org.apache.harmony.crypto.utils;
 
 import java.security.Provider;
 import java.security.Security;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/internal/NullCipherSpiTest.java
(from r391578, incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/internal/NullCipherSpiTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/internal/NullCipherSpiTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java&r1=391578&r2=391586&rev=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/java/org/apache/harmony/crypto/internal/NullCipherSpiTest.java
Wed Apr  5 04:27:45 2006
@@ -19,14 +19,14 @@
 * @version $Revision$
 */
 
-package org.apache.harmony.security.x.crypto;
+package org.apache.harmony.crypto.internal;
 
 import java.nio.ByteBuffer;
 
 import javax.crypto.ShortBufferException;
 
 import junit.framework.TestCase;
-import org.apache.harmony.security.x.crypto.NullCipherSpi;
+import org.apache.harmony.crypto.internal.NullCipherSpi;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/PublicKeyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/PublicKeyImpl.java?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/PublicKeyImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/PublicKeyImpl.java
Wed Apr  5 04:27:45 2006
@@ -24,7 +24,7 @@
 import java.security.PublicKey;
 import java.util.Arrays;
 
-import org.apache.harmony.security.x.crypto.utils.AlgNameMapper;
+import org.apache.harmony.crypto.utils.AlgNameMapper;
 
 /**
  * PublicKeyImpl

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CRLImpl.java
Wed Apr  5 04:27:45 2006
@@ -43,7 +43,7 @@
 import java.util.List;
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.harmony.security.x.crypto.utils.AlgNameMapper;
+import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.CertificateList;
 import org.apache.harmony.security.x509.Extensions;
 import org.apache.harmony.security.x509.TBSCertList;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/provider/cert/X509CertImpl.java
Wed Apr  5 04:27:45 2006
@@ -44,8 +44,9 @@
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateParsingException;
+
+import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.asn1.*;
-import org.apache.harmony.security.x.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.x509.*;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
Wed Apr  5 04:27:45 2006
@@ -26,6 +26,7 @@
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;
 
+import org.apache.harmony.crypto.utils.AlgNameMapper;
 import org.apache.harmony.security.PublicKeyImpl;
 import org.apache.harmony.security.asn1.ASN1Sequence;
 import org.apache.harmony.security.asn1.ASN1Type;
@@ -34,7 +35,6 @@
 
 
 import org.apache.harmony.security.asn1.*;
-import org.apache.harmony.security.x.crypto.utils.AlgNameMapper;
 
 /**
  * The class incapsulates the ASN.1 DER encoding/decoding work

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=391586&r1=391585&r2=391586&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Wed Apr
 5 04:27:45 2006
@@ -56,7 +56,7 @@
                     <!-- FIXME: X-NET tests should not reach into security module code
-->
                     <src>
                         <pathelement location="${hy.x-net.src.test.java}"/>
-                        <pathelement location="${hy.x-net}/../security/test/common/unit"/>
+                        <pathelement location="${hy.x-net}/../security/src/test/java/common"/>
                     </src>
 
                     <include name="javax/net/**/*Test*.java" />



Mime
View raw message