Index: modules/crypto/make/common/build.xml
===================================================================
--- modules/crypto/make/common/build.xml.orig 2006-04-06 20:19:18.000000000 +0100
+++ modules/crypto/make/common/build.xml 2006-04-06 20:25:46.000000000 +0100
@@ -62,7 +62,7 @@
-
+
@@ -71,6 +71,7 @@
+
@@ -102,11 +103,23 @@
+
+
+
+
+
+
+
+
+
+
Index: modules/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java
===================================================================
--- modules/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java.orig 2006-04-06 20:19:18.000000000 +0100
+++ modules/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java 2006-04-06 20:19:50.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import junit.framework.Test;
import junit.framework.TestSuite;
Index: modules/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
===================================================================
--- modules/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java.orig 2006-04-06 20:19:18.000000000 +0100
+++ modules/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java 2006-04-06 20:19:50.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.javax.crypto;
+package org.apache.harmony.crypto.tests.javax.crypto;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControlContextTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControlContextTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControlContextTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.AccessControlContext;
import java.security.AccessController;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.FilePermission;
import java.security.AccessControlException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControllerTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControllerTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AccessControllerTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.AccessController;
import java.security.AllPermission;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AlgorithmParameterGeneratorTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AlgorithmParameterGeneratorTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AlgorithmParameterGeneratorTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.math.BigInteger;
import java.security.AlgorithmParameterGenerator;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.IOException;
import java.math.BigInteger;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AllPermissionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AllPermissionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AllPermissionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.AllPermission;
import java.security.SecurityPermission;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AllTests.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AllTests.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/AllTests.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import junit.framework.Test;
import junit.framework.TestSuite;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/BasicPermissionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/BasicPermissionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/BasicPermissionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.BasicPermission;
import java.security.PermissionCollection;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/CodeSourceTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/CodeSourceTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.net.MalformedURLException;
import java.net.URL;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.DigestException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.ByteArrayOutputStream;
import java.security.DigestOutputStream;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DomainCombinerTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DomainCombinerTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/DomainCombinerTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.AccessControlContext;
import java.security.AccessController;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.GeneralSecurityException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.Identity;
import java.security.IdentityScope;
@@ -26,7 +26,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import tests.api.java.security.IdentityTest.IdentitySubclass;
+import org.apache.harmony.security.tests.java.security.IdentityTest.IdentitySubclass;
public class IdentityScopeTest extends junit.framework.TestCase {
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/IdentityTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/IdentityTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/IdentityTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -29,7 +29,7 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import tests.api.java.security.IdentityScopeTest.IdentityScopeSubclass;
+import org.apache.harmony.security.tests.java.security.IdentityScopeTest.IdentityScopeSubclass;
public class IdentityTest extends junit.framework.TestCase {
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.InvalidAlgorithmParameterException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.InvalidKeyException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.InvalidParameterException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.KeyException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.KeyManagementException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyPairGeneratorTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyPairGeneratorTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyPairGeneratorTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.KeyStoreException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyStoreTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/KeyStoreTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/MessageDigestTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/MessageDigestTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/MessageDigestTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
@@ -113,7 +113,7 @@
// Made up data
output
- .writeUTF("tests.api.java.security.MessageDigestTest$InitializerFieldsTest3");
+ .writeUTF("org.apache.harmony.security.tests.java.security.MessageDigestTest$InitializerFieldsTest3");
output.writeInt(0); // class modifiers
output.writeUTF("java.io.Serializable"); // interfaces
@@ -181,7 +181,7 @@
// Made up data
output
- .writeUTF("tests.api.java.security.MessageDigestTest$OptionalDataNotRead");
+ .writeUTF("org.apache.harmony.security.tests.java.security.MessageDigestTest$OptionalDataNotRead");
// name
output.writeInt(0); // class modifiers
output.writeUTF("java.io.Serializable"); // interfaces
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.NoSuchAlgorithmException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.NoSuchProviderException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.File;
import java.io.FileNotFoundException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.Permission;
import java.security.PermissionCollection;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionsTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionsTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PermissionsTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.File;
import java.io.FilePermission;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PolicyTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PolicyTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PolicyTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.CodeSource;
import java.security.PermissionCollection;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PrincipalTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PrincipalTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PrincipalTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.Principal;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.IOException;
import java.security.PrivilegedActionException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.ProviderException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/ProviderTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/ProviderTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/ProviderTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.Provider;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecureClassLoaderTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecureClassLoaderTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecureClassLoaderTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.io.File;
import java.io.IOException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecureRandomTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecureRandomTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecureRandomTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.SecurityPermission;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecurityTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecurityTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SecurityTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.InvalidParameterException;
import java.security.Provider;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.SignatureException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignatureTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignatureTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignatureTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.math.BigInteger;
import java.security.InvalidKeyException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignerTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignerTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/SignerTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.IdentityScope;
import java.security.KeyManagementException;
@@ -21,7 +21,7 @@
import java.security.KeyPairGenerator;
import java.security.Signer;
-import tests.api.java.security.IdentityScopeTest.IdentityScopeSubclass;
+import org.apache.harmony.security.tests.java.security.IdentityScopeTest.IdentityScopeSubclass;
public class SignerTest extends junit.framework.TestCase {
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
import java.security.UnrecoverableKeyException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
import java.security.acl.AclNotFoundException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/AllTests.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/AllTests.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/AllTests.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
import junit.framework.Test;
import junit.framework.TestSuite;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
import java.security.acl.LastOwnerException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
import java.security.acl.NotOwnerException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/AllTests.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/AllTests.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/AllTests.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import junit.framework.Test;
import junit.framework.TestSuite;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateEncodingExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateEncodingExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateEncodingExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import java.security.cert.CertificateEncodingException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateExceptionTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateExceptionTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateExceptionTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import java.security.cert.CertificateException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateFactoryTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateFactoryTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/CertificateFactoryTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CRLEntryTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CRLEntryTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CRLEntryTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import java.io.InputStream;
import java.security.cert.CertificateException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CRLTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CRLTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CRLTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import java.io.InputStream;
import java.security.cert.CertificateException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CertificateTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CertificateTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/cert/X509CertificateTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
import java.io.InputStream;
import java.security.cert.CertificateException;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/spec/AllTests.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/spec/AllTests.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/spec/AllTests.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.spec;
+package org.apache.harmony.security.tests.java.security.spec;
import junit.framework.Test;
import junit.framework.TestSuite;
Index: modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/spec/EncodedKeySpecTest.java
===================================================================
--- modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/spec/EncodedKeySpecTest.java.orig 2006-02-10 15:34:50.000000000 +0000
+++ modules/security/src/test/java/common/org/apache/harmony/security/tests/java/security/spec/EncodedKeySpecTest.java 2006-04-06 21:20:14.000000000 +0100
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.security.spec;
+package org.apache.harmony.security.tests.java.security.spec;
import java.security.Key;
import java.security.KeyFactory;
Index: modules/security/make/common/build.xml
===================================================================
--- modules/security/make/common/build.xml.orig 2006-04-06 06:02:54.000000000 +0100
+++ modules/security/make/common/build.xml 2006-04-07 07:03:02.000000000 +0100
@@ -81,6 +81,8 @@
+
+
@@ -108,6 +110,17 @@
+
+
+
+
+
+
+
+
+
@@ -117,7 +130,7 @@
-
+
@@ -127,6 +140,8 @@
+
+
@@ -135,6 +150,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+