harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r370540 [1/2] - in /incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit: com/openintel/drl/security/ com/openintel/drl/security/provider/cert/ com/openintel/drl/security/test/ com/openintel/fortress/drl/security/ ja...
Date Thu, 19 Jan 2006 16:35:49 GMT
Author: geirm
Date: Thu Jan 19 08:35:13 2006
New Revision: 370540

URL: http://svn.apache.org/viewcvs?rev=370540&view=rev
Log:
modified and moved tests - also the "golden files" for 
serialization tests

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/CertificateStub.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/CertificateStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/DefaultPolicyScannerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityScopeStub.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityScopeStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityStub.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/MDGoldenData.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/MDGoldenData.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PolicyEntryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PrivateKeyStub.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PrivateKeyStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PublicKeyStub.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PublicKeyStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SignerStub.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SignerStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SpiEngUtils.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SpiEngUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SystemScopeTest.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SystemScopeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/TestCertUtils.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/TestCertUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/TestKeyPair.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/TestKeyPair.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/UnresolvedPrincipalTest.java
      - copied, changed from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/UnresolvedPrincipalTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/
      - copied from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/provider/cert/
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/CertificateStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/DefaultPolicyScannerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityScopeStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/MDGoldenData.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PolicyEntryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PrivateKeyStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PublicKeyStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SignerStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SpiEngUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SystemScopeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/TestCertUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/TestKeyPair.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/UnresolvedPrincipalTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/provider/cert/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/test/SecurityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyParserTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/TrustAnchorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/X509CertSelectorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.0.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.1.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.0.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.1.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.2.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.3.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/KeyPairTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/SignedObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.0.dat
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/CipherTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/X509CertificateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/CertFactoryTestData.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/DRLCertFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/X509CRLImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/X509CertFactoryPerfTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/X509CertImplTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/provider/cert/X509CertPathImplTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/test/SecurityTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/test/SecurityTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/test/SecurityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/test/SecurityTest.java Thu Jan 19 08:35:13 2006
@@ -363,7 +363,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testHasNext_EmptySet()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext_EmptySet()
          */
         public void testHasNext_EmptySet() {
             setReadOnly();
@@ -371,7 +371,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testHasNext()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext()
          */
         public void testHasNext() {
 
@@ -382,7 +382,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
          */
         public void testNext_EmptySet_NoSuchElementException() {
             setReadOnly();
@@ -390,7 +390,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testNext()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext()
          */
         public void testNext() {
 
@@ -404,7 +404,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testNext_NoSuchElementException()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_NoSuchElementException()
          */
         public void testNext_NoSuchElementException() {
 
@@ -442,7 +442,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
          */
         public void testRemove_EmptySet_IllegalStateException() {
             setReadOnly();
@@ -500,7 +500,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testHasNext_EmptySet()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext_EmptySet()
          */
         public void testHasNext_EmptySet() {
             setSecure();
@@ -508,7 +508,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testHasNext()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testHasNext()
          */
         public void testHasNext() {
             set.add(element);
@@ -518,7 +518,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
          */
         public void testNext_EmptySet_NoSuchElementException() {
             setSecure();
@@ -526,7 +526,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testNext_NoSuchElementException()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext_NoSuchElementException()
          */
         public void testNext_NoSuchElementException() {
             set.add(element);
@@ -543,7 +543,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testNext()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testNext()
          */
         public void testNext() {
             set.add(element);
@@ -577,7 +577,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
          * 
          * Expected: AccessControlException instead IllegalStateException for empty set
          */
@@ -593,7 +593,7 @@
         }
 
         /**
-         * @see com.openintel.drl.security.test.SecurityTest.IteratorTest#testRemove_IllegalStateException_NoNext()
+         * @see org.apache.harmony.security.test.SecurityTest.IteratorTest#testRemove_IllegalStateException_NoNext()
          * 
          * Expected: AccessControlException instead IllegalStateException
          */

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyParserTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyParserTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyParserTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyParserTest.java Thu Jan 19 08:35:13 2006
@@ -31,7 +31,8 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.openintel.drl.security.PolicyEntry;
+import org.apache.harmony.security.PolicyEntry;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/fortress/drl/security/DefaultPolicyTest.java Thu Jan 19 08:35:13 2006
@@ -34,8 +34,9 @@
 import java.util.HashSet;
 import java.util.Properties;
 
-import com.openintel.drl.security.UnresolvedPrincipal;
-import com.openintel.drl.security.PolicyEntry;
+import org.apache.harmony.security.PolicyEntry;
+import org.apache.harmony.security.UnresolvedPrincipal;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java Thu Jan 19 08:35:13 2006
@@ -23,7 +23,8 @@
 
 import java.security.spec.AlgorithmParameterSpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java Thu Jan 19 08:35:13 2006
@@ -24,7 +24,8 @@
 import java.security.cert.CertPath;
 import java.util.Date;
 
-import com.openintel.drl.security.TestCertUtils;
+import org.apache.harmony.security.TestCertUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java Thu Jan 19 08:35:13 2006
@@ -35,7 +35,8 @@
 
 import javax.security.auth.x500.X500Principal;
 
-import com.openintel.drl.security.TestCertUtils;
+import org.apache.harmony.security.TestCertUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java Thu Jan 19 08:35:13 2006
@@ -28,10 +28,11 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import com.openintel.drl.security.MDGoldenData;
 import com.openintel.drl.security.test.PerformanceTest;
 
 import java.util.Arrays;
+
+import org.apache.harmony.security.MDGoldenData;
 
 /**
  * Tests for fields and methods of class <code>DigestInputStream</code>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java Thu Jan 19 08:35:13 2006
@@ -26,7 +26,8 @@
 import java.io.OutputStream;
 import java.util.Arrays;
 
-import com.openintel.drl.security.MDGoldenData;
+import org.apache.harmony.security.MDGoldenData;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java Thu Jan 19 08:35:13 2006
@@ -21,7 +21,8 @@
 
 package java.security;
 
-import com.openintel.drl.security.IdentityScopeStub;
+import org.apache.harmony.security.IdentityScopeStub;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java Thu Jan 19 08:35:13 2006
@@ -23,9 +23,10 @@
 
 
 
-import com.openintel.drl.security.CertificateStub;
-import com.openintel.drl.security.IdentityStub;
-import com.openintel.drl.security.PublicKeyStub;
+import org.apache.harmony.security.CertificateStub;
+import org.apache.harmony.security.IdentityStub;
+import org.apache.harmony.security.PublicKeyStub;
+
 import com.openintel.drl.security.test.PerformanceTest;
 /**
  * Tests for class Identity

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java Thu Jan 19 08:35:13 2006
@@ -21,8 +21,6 @@
 
 package java.security;
 
-import com.openintel.drl.security.SpiEngUtils;
-import com.openintel.drl.security.TestKeyPair;
 import com.openintel.drl.security.test.PerformanceTest;
 import com.openintel.drl.security.test.TestUtils;
 
@@ -35,6 +33,9 @@
 import java.security.spec.InvalidKeySpecException;
 
 import java.util.Enumeration;
+
+import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.TestKeyPair;
 
 /**
  * Tests for <code>KeyStore.Builder</code> class

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest1.java Thu Jan 19 08:35:13 2006
@@ -21,11 +21,12 @@
 
 package java.security;
 
-import com.openintel.drl.security.SpiEngUtils;
 import com.openintel.drl.security.test.PerformanceTest;
 
 import java.math.BigInteger;
 import java.security.spec.AlgorithmParameterSpec;
+
+import org.apache.harmony.security.SpiEngUtils;
 
 /**
  * Tests for <code>KeyPairGenerator</code> class constructors and methods.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest2.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest3.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest3.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest3.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest3.java Thu Jan 19 08:35:13 2006
@@ -24,7 +24,8 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java Thu Jan 19 08:35:13 2006
@@ -31,8 +31,9 @@
 import javax.crypto.SecretKey;
 import javax.security.auth.DestroyFailedException;
 
-import com.openintel.drl.security.SpiEngUtils;
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.TestKeyPair;
+
 import com.openintel.drl.security.test.PerformanceTest;
 /**
  * Tests for <code>KeyStore</code> constructor and methods

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java Thu Jan 19 08:35:13 2006
@@ -31,9 +31,10 @@
 
 import javax.crypto.spec.SecretKeySpec;
 
+import org.apache.harmony.security.SpiEngUtils;
+
 import java.util.Date;
 
-import com.openintel.drl.security.SpiEngUtils;
 import com.openintel.drl.security.cert.MyCertificate;
 import com.openintel.drl.security.test.PerformanceTest;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java Thu Jan 19 08:35:13 2006
@@ -30,7 +30,8 @@
 import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java Thu Jan 19 08:35:13 2006
@@ -30,7 +30,8 @@
 import java.util.Set;
 import java.util.Map.Entry;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 import com.openintel.drl.security.test.TestUtils;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java Thu Jan 19 08:35:13 2006
@@ -25,7 +25,8 @@
 import java.util.Properties;
 import java.util.Set;
 
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.TestKeyPair;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java Thu Jan 19 08:35:13 2006
@@ -25,7 +25,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.util.Properties;
 
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.TestKeyPair;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java Thu Jan 19 08:35:13 2006
@@ -21,7 +21,8 @@
 
 package java.security;
 
-import com.openintel.drl.security.*;
+import org.apache.harmony.security.*;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest1.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.Provider;
 import java.security.Security;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderTest2.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.Provider;
 import java.security.Security;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest1.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.Provider;
 import java.security.Security;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.cert.MyCertPath;
 import com.openintel.drl.security.test.PerformanceTest;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest2.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.Provider;
 import java.security.Security;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest3.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest3.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest3.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorTest3.java Thu Jan 19 08:35:13 2006
@@ -27,7 +27,8 @@
 import java.security.NoSuchProviderException;
 import java.security.Provider;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.cert.MyCertPath;
 import com.openintel.drl.security.cert.TestUtils;
 import com.openintel.drl.security.test.PerformanceTest;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest1.java Thu Jan 19 08:35:13 2006
@@ -28,7 +28,8 @@
 import java.security.Security;
 import java.util.Collection;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreTest2.java Thu Jan 19 08:35:13 2006
@@ -28,7 +28,8 @@
 import java.security.Security;
 import java.util.Collection;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest1.java Thu Jan 19 08:35:13 2006
@@ -33,7 +33,8 @@
 import java.util.List;
 import java.util.Vector;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.cert.MyCertificate;
 import com.openintel.drl.security.cert.MyCertPath;
 import com.openintel.drl.security.test.PerformanceTest;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest2.java Thu Jan 19 08:35:13 2006
@@ -31,7 +31,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest3.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest3.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest3.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactoryTest3.java Thu Jan 19 08:35:13 2006
@@ -32,7 +32,8 @@
 import java.util.List;
 import java.util.Vector;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 import com.openintel.drl.security.test.TestUtils;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/TrustAnchorTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/TrustAnchorTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/TrustAnchorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/TrustAnchorTest.java Thu Jan 19 08:35:13 2006
@@ -30,7 +30,8 @@
 
 import javax.security.auth.x500.X500Principal;
 
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.TestKeyPair;
+
 import com.openintel.drl.security.cert.TestUtils;
 import com.openintel.drl.security.test.PerformanceTest;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/X509CertSelectorTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/X509CertSelectorTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/X509CertSelectorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/X509CertSelectorTest.java Thu Jan 19 08:35:13 2006
@@ -46,6 +46,7 @@
 import java.util.Collection;
 import javax.security.auth.x500.X500Principal;
 
+import org.apache.harmony.security.TestKeyPair;
 import org.apache.harmony.security.asn1.ASN1Boolean;
 import org.apache.harmony.security.asn1.ASN1Integer;
 import org.apache.harmony.security.asn1.ASN1OctetString;
@@ -55,7 +56,6 @@
 
 import org.apache.harmony.security.asn1.*;
 
-import com.openintel.drl.security.TestKeyPair;
 import com.openintel.drl.security.x509.*;
 import com.openintel.drl.security.x501.Name;
 import com.openintel.drl.security.x509.NameConstraints;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.0.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.0.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.1.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.1.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSignerTest.java Thu Jan 19 08:35:13 2006
@@ -26,7 +26,8 @@
 import java.security.cert.CertPath;
 import java.util.Date;
 
-import com.openintel.drl.security.TestCertUtils;
+import org.apache.harmony.security.TestCertUtils;
+
 import com.openintel.drl.security.test.SerializationTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.0.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.0.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.1.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.1.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.2.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.2.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.3.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.3.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/CodeSourceTest.java Thu Jan 19 08:35:13 2006
@@ -34,7 +34,8 @@
 import java.security.cert.CertificateEncodingException;
 import java.util.Date;
 
-import com.openintel.drl.security.TestCertUtils;
+import org.apache.harmony.security.TestCertUtils;
+
 import com.openintel.drl.security.test.SerializationTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/KeyPairTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/KeyPairTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/KeyPairTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/KeyPairTest.java Thu Jan 19 08:35:13 2006
@@ -37,10 +37,11 @@
 import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 
+import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.TestKeyPair;
+
 import junit.framework.TestCase;
 
-import com.openintel.drl.security.SpiEngUtils;
-import com.openintel.drl.security.TestKeyPair;
 import com.openintel.drl.security.test.TestUtils;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/SignedObjectTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/SignedObjectTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/SignedObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/SignedObjectTest.java Thu Jan 19 08:35:13 2006
@@ -30,7 +30,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.util.Properties;
 
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.TestKeyPair;
+
 import com.openintel.drl.security.test.SerializationTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.0.dat
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.0.dat?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/serialization/TimestampTest.java Thu Jan 19 08:35:13 2006
@@ -25,7 +25,8 @@
 import java.security.cert.CertPath;
 import java.util.Date;
 
-import com.openintel.drl.security.TestCertUtils;
+import org.apache.harmony.security.TestCertUtils;
+
 import com.openintel.drl.security.test.SerializationTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/CipherTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/CipherTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/CipherTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/CipherTest.java Thu Jan 19 08:35:13 2006
@@ -30,7 +30,8 @@
 import java.util.Date;
 import java.util.Enumeration;
 
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.TestKeyPair;
+
 
 import junit.framework.TestCase;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismTest1.java Thu Jan 19 08:35:13 2006
@@ -34,7 +34,8 @@
 
 import javax.crypto.spec.SecretKeySpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest1.java Thu Jan 19 08:35:13 2006
@@ -36,8 +36,9 @@
 import javax.crypto.interfaces.DHPrivateKey;
 import javax.crypto.spec.DHParameterSpec;
 
-import com.openintel.drl.security.SpiEngUtils;
-import com.openintel.drl.security.TestKeyPair;
+import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.TestKeyPair;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest2.java Thu Jan 19 08:35:13 2006
@@ -33,7 +33,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest1.java Thu Jan 19 08:35:13 2006
@@ -29,7 +29,8 @@
 import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest2.java Thu Jan 19 08:35:13 2006
@@ -32,7 +32,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java Thu Jan 19 08:35:13 2006
@@ -31,10 +31,11 @@
 
 import javax.crypto.spec.SecretKeySpec;
 
+import org.apache.harmony.security.SpiEngUtils;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import com.openintel.drl.security.SpiEngUtils;
 import com.openintel.drl.security.test.PerformanceTest;
 /**
  * Tests for Mac class constructors and methods

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java Thu Jan 19 08:35:13 2006
@@ -33,7 +33,8 @@
 
 import javax.crypto.spec.SecretKeySpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java Thu Jan 19 08:35:13 2006
@@ -32,7 +32,8 @@
 import javax.crypto.spec.DESedeKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java Thu Jan 19 08:35:13 2006
@@ -29,7 +29,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 
-import com.openintel.drl.security.SpiEngUtils;
+import org.apache.harmony.security.SpiEngUtils;
+
 import com.openintel.drl.security.test.PerformanceTest;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java Thu Jan 19 08:35:13 2006
@@ -57,7 +57,7 @@
 
     /**
      * number of iterations in performance mode 
-     * @see com.openintel.drl.security.test.PerformanceTest#getRepeatCount()
+     * @see org.apache.harmony.security.test.PerformanceTest#getRepeatCount()
      */
     public long getRepeatCount() {
         return 100000;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/X509CertificateTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/X509CertificateTest.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/X509CertificateTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/X509CertificateTest.java Thu Jan 19 08:35:13 2006
@@ -44,7 +44,7 @@
 public class X509CertificateTest extends TestCase {
 
     // Testing data was generated by using of classes 
-    // from com.openintel.drl.security.asn1 package encoded
+    // from org.apache.harmony.security.asn1 package encoded
     // by com.openintel.drl.misc.Base64 class.
 
     private static String base64cert = 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java Thu Jan 19 08:35:13 2006
@@ -21,12 +21,13 @@
 
 package javax.security.sasl;
 
-import com.openintel.drl.security.SpiEngUtils;
 import com.openintel.drl.security.test.PerformanceTest;
 
 import java.security.Provider;
 import java.security.Security;
 import javax.security.auth.callback.CallbackHandler;
+
+import org.apache.harmony.security.SpiEngUtils;
 
 import java.util.Enumeration;
 import java.util.Map;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java Thu Jan 19 08:35:13 2006
@@ -21,7 +21,6 @@
 
 package javax.security.sasl;
 
-import com.openintel.drl.security.SpiEngUtils;
 import com.openintel.drl.security.test.PerformanceTest;
 
 import java.io.IOException;
@@ -35,6 +34,8 @@
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.harmony.security.SpiEngUtils;
 
 /**
  * Test for Sasl class

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java?rev=370540&r1=370539&r2=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java Thu Jan 19 08:35:13 2006
@@ -21,7 +21,6 @@
 
 package javax.security.sasl;
 
-import com.openintel.drl.security.SpiEngUtils;
 import com.openintel.drl.security.test.PerformanceTest;
 
 import java.io.IOException;
@@ -32,6 +31,8 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.harmony.security.SpiEngUtils;
 
 /**
  * Test for Sasl class

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/CertificateStub.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/CertificateStub.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/CertificateStub.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/CertificateStub.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/CertificateStub.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/CertificateStub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/CertificateStub.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/DefaultPolicyScannerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/DefaultPolicyScannerTest.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/DefaultPolicyScannerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -29,6 +29,8 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+
+import org.apache.harmony.security.DefaultPolicyScanner;
 
 import com.openintel.drl.security.test.PerformanceTest;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityScopeStub.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityScopeStub.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityScopeStub.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityScopeStub.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityScopeStub.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityScopeStub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityScopeStub.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.security.Identity;
 import java.security.IdentityScope;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityStub.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityStub.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityStub.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityStub.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityStub.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/IdentityStub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/IdentityStub.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.security.Identity;
 import java.security.IdentityScope;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/MDGoldenData.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/MDGoldenData.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/MDGoldenData.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/MDGoldenData.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/MDGoldenData.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/MDGoldenData.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/MDGoldenData.java Thu Jan 19 08:35:13 2006
@@ -18,7 +18,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.util.HashMap;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PolicyEntryTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PolicyEntryTest.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PolicyEntryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.net.URL;
 import java.security.cert.Certificate;
@@ -32,6 +32,9 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+
+import org.apache.harmony.security.PolicyEntry;
+import org.apache.harmony.security.UnresolvedPrincipal;
 
 import com.openintel.drl.security.test.PerformanceTest;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PrivateKeyStub.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PrivateKeyStub.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PrivateKeyStub.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PrivateKeyStub.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PrivateKeyStub.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PrivateKeyStub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PrivateKeyStub.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.security.PrivateKey;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PublicKeyStub.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PublicKeyStub.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PublicKeyStub.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PublicKeyStub.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PublicKeyStub.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/PublicKeyStub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PublicKeyStub.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 
 import java.security.PublicKey;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SignerStub.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SignerStub.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SignerStub.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SignerStub.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SignerStub.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SignerStub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SignerStub.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.security.IdentityScope;
 import java.security.KeyManagementException;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SpiEngUtils.java (from r369816, incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SpiEngUtils.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SpiEngUtils.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SpiEngUtils.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SpiEngUtils.java&r1=369816&r2=370540&rev=370540&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/com/openintel/drl/security/SpiEngUtils.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SpiEngUtils.java Thu Jan 19 08:35:13 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package com.openintel.drl.security;
+package org.apache.harmony.security;
 
 import java.io.File;
 import java.security.Security;



Mime
View raw message