You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2008/02/01 19:21:33 UTC
svn commit: r617588 [4/4] - in /geronimo/server/trunk: ./
buildsupport/car-maven-plugin/
buildsupport/car-maven-plugin/src/it/j2ee-system-2/
buildsupport/car-maven-plugin/src/it/j2ee-system-2/src/test/resources/META-INF/
buildsupport/car-maven-plugin/s...
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/interfaces/PKCS12BagAttributeCarrier.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/interfaces/PKCS12BagAttributeCarrier.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/interfaces/PKCS12BagAttributeCarrier.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/interfaces/PKCS12BagAttributeCarrier.java Fri Feb 1 10:20:07 2008
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.interfaces;
+package org.apache.geronimo.crypto.jce.interfaces;
import java.util.Enumeration;
-import org.apache.geronimo.util.asn1.DEREncodable;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.asn1.DEREncodable;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
/**
* allow us to set attributes on objects that can go into a PKCS12 store.
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPrivateKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPrivateKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPrivateKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPrivateKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -30,17 +30,17 @@
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPrivateKeySpec;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.DEREncodable;
-import org.apache.geronimo.util.asn1.DERInteger;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.pkcs.DHParameter;
-import org.apache.geronimo.util.asn1.pkcs.PKCSObjectIdentifiers;
-import org.apache.geronimo.util.asn1.pkcs.PrivateKeyInfo;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.crypto.params.DHPrivateKeyParameters;
-import org.apache.geronimo.util.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.DEREncodable;
+import org.apache.geronimo.crypto.asn1.DERInteger;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.pkcs.DHParameter;
+import org.apache.geronimo.crypto.asn1.pkcs.PKCSObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.pkcs.PrivateKeyInfo;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.crypto.params.DHPrivateKeyParameters;
+import org.apache.geronimo.crypto.jce.interfaces.PKCS12BagAttributeCarrier;
public class JCEDHPrivateKey
implements DHPrivateKey, PKCS12BagAttributeCarrier
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPublicKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPublicKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPublicKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCEDHPublicKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -27,14 +27,14 @@
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.DERInteger;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.pkcs.DHParameter;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.asn1.x509.SubjectPublicKeyInfo;
-import org.apache.geronimo.util.asn1.x9.X9ObjectIdentifiers;
-import org.apache.geronimo.util.crypto.params.DHPublicKeyParameters;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.DERInteger;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.pkcs.DHParameter;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.asn1.x509.SubjectPublicKeyInfo;
+import org.apache.geronimo.crypto.asn1.x9.X9ObjectIdentifiers;
+import org.apache.geronimo.crypto.crypto.params.DHPublicKeyParameters;
public class JCEDHPublicKey
implements DHPublicKey
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateCrtKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateCrtKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateCrtKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateCrtKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,14 +23,14 @@
import java.security.interfaces.RSAPrivateCrtKey;
import java.security.spec.RSAPrivateCrtKeySpec;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.DERNull;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.pkcs.PKCSObjectIdentifiers;
-import org.apache.geronimo.util.asn1.pkcs.PrivateKeyInfo;
-import org.apache.geronimo.util.asn1.pkcs.RSAPrivateKeyStructure;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.crypto.params.RSAPrivateCrtKeyParameters;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.DERNull;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.pkcs.PKCSObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.pkcs.PrivateKeyInfo;
+import org.apache.geronimo.crypto.asn1.pkcs.RSAPrivateKeyStructure;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.crypto.params.RSAPrivateCrtKeyParameters;
/**
* A provider representation for a RSA private key, with CRT factors included.
@@ -47,7 +47,7 @@
private BigInteger crtCoefficient;
/**
- * construct a private key from it's org.apache.geronimo.util.crypto equivalent.
+ * construct a private key from it's org.apache.geronimo.crypto.crypto equivalent.
*
* @param key the parameters object representing the private key.
*/
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPrivateKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,12 +29,12 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.geronimo.util.asn1.ASN1InputStream;
-import org.apache.geronimo.util.asn1.ASN1OutputStream;
-import org.apache.geronimo.util.asn1.DEREncodable;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
-import org.apache.geronimo.util.crypto.params.RSAKeyParameters;
-import org.apache.geronimo.util.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.apache.geronimo.crypto.asn1.ASN1InputStream;
+import org.apache.geronimo.crypto.asn1.ASN1OutputStream;
+import org.apache.geronimo.crypto.asn1.DEREncodable;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.crypto.params.RSAKeyParameters;
+import org.apache.geronimo.crypto.jce.interfaces.PKCS12BagAttributeCarrier;
public class JCERSAPrivateKey
implements RSAPrivateKey, PKCS12BagAttributeCarrier
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPublicKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPublicKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPublicKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JCERSAPublicKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,14 +23,14 @@
import java.security.interfaces.RSAPublicKey;
import java.security.spec.RSAPublicKeySpec;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.DERNull;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.pkcs.PKCSObjectIdentifiers;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.asn1.x509.RSAPublicKeyStructure;
-import org.apache.geronimo.util.asn1.x509.SubjectPublicKeyInfo;
-import org.apache.geronimo.util.crypto.params.RSAKeyParameters;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.DERNull;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.pkcs.PKCSObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.asn1.x509.RSAPublicKeyStructure;
+import org.apache.geronimo.crypto.asn1.x509.SubjectPublicKeyInfo;
+import org.apache.geronimo.crypto.crypto.params.RSAKeyParameters;
public class JCERSAPublicKey
implements RSAPublicKey
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPrivateKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPrivateKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPrivateKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPrivateKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -28,17 +28,17 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.DEREncodable;
-import org.apache.geronimo.util.asn1.DERInteger;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.pkcs.PrivateKeyInfo;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.asn1.x509.DSAParameter;
-import org.apache.geronimo.util.asn1.x9.X9ObjectIdentifiers;
-import org.apache.geronimo.util.crypto.params.DSAPrivateKeyParameters;
-import org.apache.geronimo.util.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.DEREncodable;
+import org.apache.geronimo.crypto.asn1.DERInteger;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.pkcs.PrivateKeyInfo;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.asn1.x509.DSAParameter;
+import org.apache.geronimo.crypto.asn1.x9.X9ObjectIdentifiers;
+import org.apache.geronimo.crypto.crypto.params.DSAPrivateKeyParameters;
+import org.apache.geronimo.crypto.jce.interfaces.PKCS12BagAttributeCarrier;
public class JDKDSAPrivateKey
implements DSAPrivateKey, PKCS12BagAttributeCarrier
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPublicKey.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPublicKey.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPublicKey.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKDSAPublicKey.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -25,14 +25,14 @@
import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAPublicKeySpec;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.DERInteger;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.asn1.x509.DSAParameter;
-import org.apache.geronimo.util.asn1.x509.SubjectPublicKeyInfo;
-import org.apache.geronimo.util.asn1.x9.X9ObjectIdentifiers;
-import org.apache.geronimo.util.crypto.params.DSAPublicKeyParameters;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.DERInteger;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.asn1.x509.DSAParameter;
+import org.apache.geronimo.crypto.asn1.x509.SubjectPublicKeyInfo;
+import org.apache.geronimo.crypto.asn1.x9.X9ObjectIdentifiers;
+import org.apache.geronimo.crypto.crypto.params.DSAPublicKeyParameters;
public class JDKDSAPublicKey
implements DSAPublicKey
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKKeyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKKeyFactory.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKKeyFactory.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/JDKKeyFactory.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -45,19 +45,19 @@
import javax.crypto.spec.DHPrivateKeySpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.apache.geronimo.util.asn1.ASN1InputStream;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.apache.geronimo.util.asn1.oiw.OIWObjectIdentifiers;
-import org.apache.geronimo.util.asn1.pkcs.PKCSObjectIdentifiers;
-import org.apache.geronimo.util.asn1.pkcs.PrivateKeyInfo;
-import org.apache.geronimo.util.asn1.pkcs.RSAPrivateKeyStructure;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.asn1.x509.SubjectPublicKeyInfo;
-import org.apache.geronimo.util.asn1.x509.X509ObjectIdentifiers;
-import org.apache.geronimo.util.asn1.x9.X9ObjectIdentifiers;
-import org.apache.geronimo.util.jce.provider.JCEDHPrivateKey;
-import org.apache.geronimo.util.jce.provider.JCEDHPublicKey;
+import org.apache.geronimo.crypto.asn1.ASN1InputStream;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.oiw.OIWObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.pkcs.PKCSObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.pkcs.PrivateKeyInfo;
+import org.apache.geronimo.crypto.asn1.pkcs.RSAPrivateKeyStructure;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.asn1.x509.SubjectPublicKeyInfo;
+import org.apache.geronimo.crypto.asn1.x509.X509ObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.x9.X9ObjectIdentifiers;
+import org.apache.geronimo.crypto.jce.provider.JCEDHPrivateKey;
+import org.apache.geronimo.crypto.jce.provider.JCEDHPublicKey;
public abstract class JDKKeyFactory
extends KeyFactorySpi
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLEntryObject.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLEntryObject.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLEntryObject.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLEntryObject.java Fri Feb 1 10:20:07 2008
@@ -16,7 +16,7 @@
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -28,11 +28,11 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.x509.TBSCertList;
-import org.apache.geronimo.util.asn1.x509.X509Extension;
-import org.apache.geronimo.util.asn1.x509.X509Extensions;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.x509.TBSCertList;
+import org.apache.geronimo.crypto.asn1.x509.X509Extension;
+import org.apache.geronimo.crypto.asn1.x509.X509Extensions;
/**
* The following extensions are listed in RFC 2459 as relevant to CRL Entries
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLObject.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLObject.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLObject.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CRLObject.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -41,14 +41,14 @@
import javax.security.auth.x500.X500Principal;
-import org.apache.geronimo.util.asn1.ASN1OutputStream;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.x509.CertificateList;
-import org.apache.geronimo.util.asn1.x509.TBSCertList;
-import org.apache.geronimo.util.asn1.x509.X509Extension;
-import org.apache.geronimo.util.asn1.x509.X509Extensions;
-import org.apache.geronimo.util.jce.X509Principal;
+import org.apache.geronimo.crypto.asn1.ASN1OutputStream;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.x509.CertificateList;
+import org.apache.geronimo.crypto.asn1.x509.TBSCertList;
+import org.apache.geronimo.crypto.asn1.x509.X509Extension;
+import org.apache.geronimo.crypto.asn1.x509.X509Extensions;
+import org.apache.geronimo.crypto.jce.X509Principal;
/**
* The following extensions are listed in RFC 2459 as relevant to CRLs
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CertificateObject.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CertificateObject.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CertificateObject.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/jce/provider/X509CertificateObject.java Fri Feb 1 10:20:07 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.util.jce.provider;
+package org.apache.geronimo.crypto.jce.provider;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -48,20 +48,20 @@
import javax.security.auth.x500.X500Principal;
-import org.apache.geronimo.util.asn1.*;
-import org.apache.geronimo.util.asn1.misc.MiscObjectIdentifiers;
-import org.apache.geronimo.util.asn1.misc.NetscapeCertType;
-import org.apache.geronimo.util.asn1.misc.NetscapeRevocationURL;
-import org.apache.geronimo.util.asn1.misc.VerisignCzagExtension;
-import org.apache.geronimo.util.asn1.util.ASN1Dump;
-import org.apache.geronimo.util.asn1.x509.BasicConstraints;
-import org.apache.geronimo.util.asn1.x509.KeyUsage;
-import org.apache.geronimo.util.asn1.x509.X509CertificateStructure;
-import org.apache.geronimo.util.asn1.x509.X509Extension;
-import org.apache.geronimo.util.asn1.x509.X509Extensions;
-import org.apache.geronimo.util.jce.X509Principal;
-import org.apache.geronimo.util.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.apache.geronimo.util.encoders.Hex;
+import org.apache.geronimo.crypto.asn1.*;
+import org.apache.geronimo.crypto.asn1.misc.MiscObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.misc.NetscapeCertType;
+import org.apache.geronimo.crypto.asn1.misc.NetscapeRevocationURL;
+import org.apache.geronimo.crypto.asn1.misc.VerisignCzagExtension;
+import org.apache.geronimo.crypto.asn1.util.ASN1Dump;
+import org.apache.geronimo.crypto.asn1.x509.BasicConstraints;
+import org.apache.geronimo.crypto.asn1.x509.KeyUsage;
+import org.apache.geronimo.crypto.asn1.x509.X509CertificateStructure;
+import org.apache.geronimo.crypto.asn1.x509.X509Extension;
+import org.apache.geronimo.crypto.asn1.x509.X509Extensions;
+import org.apache.geronimo.crypto.jce.X509Principal;
+import org.apache.geronimo.crypto.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.apache.geronimo.crypto.encoders.Hex;
public class X509CertificateObject
extends X509Certificate
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java?rev=617588&r1=617553&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/test/java/org/apache/geronimo/util/SimpleEncryptionTest.java Fri Feb 1 10:20:07 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.util;
+package org.apache.geronimo.crypto;
import org.apache.geronimo.testsupport.TestSupport;
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java Fri Feb 1 10:20:07 2008
@@ -39,7 +39,7 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.util.encoders.Base64;
+import org.apache.geronimo.crypto.encoders.Base64;
/**
*
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandLogin.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandLogin.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandLogin.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandLogin.java Fri Feb 1 10:20:07 2008
@@ -29,7 +29,7 @@
import org.apache.geronimo.cli.deployer.CommandArgs;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
import jline.ConsoleReader;
/**
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ServerConnection.java Fri Feb 1 10:20:07 2008
@@ -40,7 +40,7 @@
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
import org.apache.geronimo.deployment.plugin.jmx.LocalDeploymentManager;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
/**
* Supports online connections to the server, via JSR-88, valid only
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java Fri Feb 1 10:20:07 2008
@@ -44,7 +44,7 @@
import org.apache.geronimo.kernel.repository.WriteableRepository;
import org.apache.geronimo.kernel.util.XmlUtil;
import org.apache.geronimo.system.plugin.model.PluginListType;
-import org.apache.geronimo.util.encoders.Base64;
+import org.apache.geronimo.crypto.encoders.Base64;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Fri Feb 1 10:20:07 2008
@@ -220,7 +220,7 @@
<dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
<dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
<dependency>geronimo/geronimo-converter/1.2-SNAPSHOT/jar</dependency>
- <dependency>geronimo/geronimo-util/1.2-SNAPSHOT/jar</dependency>
+ <dependency>geronimo/geronimo-crypto/1.2-SNAPSHOT/jar</dependency>
<dependency>geronimo/geronimo-jetty/1.2-SNAPSHOT/jar</dependency>
</plugin>
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java Fri Feb 1 10:20:07 2008
@@ -39,7 +39,7 @@
import org.apache.geronimo.management.geronimo.CertificateStore;
import org.apache.geronimo.management.geronimo.CertificateStoreException;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.CaUtils;
+import org.apache.geronimo.crypto.CaUtils;
/**
* A certificate store implementation using disk files.
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java Fri Feb 1 10:20:07 2008
@@ -45,20 +45,20 @@
import org.apache.geronimo.management.geronimo.KeystoreException;
import org.apache.geronimo.management.geronimo.KeystoreInstance;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.CaUtils;
-import org.apache.geronimo.util.asn1.ASN1InputStream;
-import org.apache.geronimo.util.asn1.DERBitString;
-import org.apache.geronimo.util.asn1.DEREncodableVector;
-import org.apache.geronimo.util.asn1.DERInteger;
-import org.apache.geronimo.util.asn1.DERObject;
-import org.apache.geronimo.util.asn1.DERSequence;
-import org.apache.geronimo.util.asn1.pkcs.PKCSObjectIdentifiers;
-import org.apache.geronimo.util.asn1.x509.AlgorithmIdentifier;
-import org.apache.geronimo.util.asn1.x509.SubjectPublicKeyInfo;
-import org.apache.geronimo.util.asn1.x509.TBSCertificateStructure;
-import org.apache.geronimo.util.asn1.x509.Time;
-import org.apache.geronimo.util.asn1.x509.V3TBSCertificateGenerator;
-import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.CaUtils;
+import org.apache.geronimo.crypto.asn1.ASN1InputStream;
+import org.apache.geronimo.crypto.asn1.DERBitString;
+import org.apache.geronimo.crypto.asn1.DEREncodableVector;
+import org.apache.geronimo.crypto.asn1.DERInteger;
+import org.apache.geronimo.crypto.asn1.DERObject;
+import org.apache.geronimo.crypto.asn1.DERSequence;
+import org.apache.geronimo.crypto.asn1.pkcs.PKCSObjectIdentifiers;
+import org.apache.geronimo.crypto.asn1.x509.AlgorithmIdentifier;
+import org.apache.geronimo.crypto.asn1.x509.SubjectPublicKeyInfo;
+import org.apache.geronimo.crypto.asn1.x509.TBSCertificateStructure;
+import org.apache.geronimo.crypto.asn1.x509.Time;
+import org.apache.geronimo.crypto.asn1.x509.V3TBSCertificateGenerator;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
/**
* A Certification Authority implementation using KeystoreInstance to store CA's private key,
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Fri Feb 1 10:20:07 2008
@@ -72,16 +72,16 @@
import org.apache.geronimo.management.geronimo.KeystoreInstance;
import org.apache.geronimo.management.geronimo.KeystoreIsLocked;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.asn1.ASN1InputStream;
-import org.apache.geronimo.util.asn1.ASN1Sequence;
-import org.apache.geronimo.util.asn1.ASN1Set;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.x509.X509CertificateStructure;
-import org.apache.geronimo.util.asn1.x509.X509Name;
-import org.apache.geronimo.util.encoders.Base64;
-import org.apache.geronimo.util.jce.PKCS10CertificationRequest;
-import org.apache.geronimo.util.jce.X509Principal;
-import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
+import org.apache.geronimo.crypto.asn1.ASN1InputStream;
+import org.apache.geronimo.crypto.asn1.ASN1Sequence;
+import org.apache.geronimo.crypto.asn1.ASN1Set;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.x509.X509CertificateStructure;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.encoders.Base64;
+import org.apache.geronimo.crypto.jce.PKCS10CertificationRequest;
+import org.apache.geronimo.crypto.jce.X509Principal;
+import org.apache.geronimo.crypto.jce.X509V1CertificateGenerator;
/**
* Implementation of KeystoreInstance that accesses a keystore file on the
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java Fri Feb 1 10:20:07 2008
@@ -64,9 +64,9 @@
import org.apache.geronimo.management.geronimo.KeystoreIsLocked;
import org.apache.geronimo.management.geronimo.KeystoreManager;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.KeystoreUtil;
-import org.apache.geronimo.util.jce.X509Principal;
-import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
+import org.apache.geronimo.crypto.KeystoreUtil;
+import org.apache.geronimo.crypto.jce.X509Principal;
+import org.apache.geronimo.crypto.jce.X509V1CertificateGenerator;
/**
* An implementation of KeystoreManager that assumes every file in a specified
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java Fri Feb 1 10:20:07 2008
@@ -49,10 +49,10 @@
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.SimpleEncryption;
-import org.apache.geronimo.util.EncryptionManager;
-import org.apache.geronimo.util.encoders.Base64;
-import org.apache.geronimo.util.encoders.HexTranslator;
+import org.apache.geronimo.crypto.SimpleEncryption;
+import org.apache.geronimo.crypto.EncryptionManager;
+import org.apache.geronimo.crypto.encoders.Base64;
+import org.apache.geronimo.crypto.encoders.HexTranslator;
/**
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java Fri Feb 1 10:20:07 2008
@@ -56,8 +56,8 @@
import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
-import org.apache.geronimo.util.encoders.Base64;
-import org.apache.geronimo.util.encoders.HexTranslator;
+import org.apache.geronimo.crypto.encoders.Base64;
+import org.apache.geronimo.crypto.encoders.HexTranslator;
/**
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeBuilder.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeBuilder.java Fri Feb 1 10:20:07 2008
@@ -30,7 +30,7 @@
import org.apache.geronimo.deployment.javabean.xbeans.BeanPropertyType;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
import org.apache.xmlbeans.XmlObject;
/**
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditor.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditor.java Fri Feb 1 10:20:07 2008
@@ -34,7 +34,7 @@
import org.apache.geronimo.deployment.javabean.xbeans.JavabeanDocument;
import org.apache.geronimo.deployment.javabean.xbeans.JavabeanType;
import org.apache.geronimo.deployment.javabean.xbeans.PropertyType;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java Fri Feb 1 10:20:07 2008
@@ -22,8 +22,8 @@
import org.apache.geronimo.deployment.javabean.xbeans.BeanPropertyType;
import org.apache.geronimo.deployment.javabean.xbeans.JavabeanType;
import org.apache.geronimo.deployment.javabean.xbeans.PropertyType;
-import org.apache.geronimo.util.Encryption;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.Encryption;
+import org.apache.geronimo.crypto.EncryptionManager;
import com.agical.rmock.extension.junit.RMockTestCase;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Feb 1 10:20:07 2008
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-util</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java Fri Feb 1 10:20:07 2008
@@ -51,7 +51,7 @@
import org.apache.geronimo.system.plugin.model.AttributeType;
import org.apache.geronimo.system.plugin.model.GbeanType;
import org.apache.geronimo.system.plugin.model.ReferenceType;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java Fri Feb 1 10:20:07 2008
@@ -34,8 +34,8 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.AbstractEncryption;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.AbstractEncryption;
+import org.apache.geronimo.crypto.EncryptionManager;
/**
* Like SimpleEncryption except it uses a stored secret key. If the key file is missing, it makes up a new one.
Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Fri Feb 1 10:20:07 2008
@@ -54,8 +54,8 @@
<module>geronimo-system</module>
<module>geronimo-transformer</module>
<module>geronimo-upgrade</module>
- <module>geronimo-util</module>
+ <module>geronimo-crypto</module>
<module>geronimo-plugin</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java (original)
+++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/java/org/apache/geronimo/ca/helper/CertificateRequestServlet.java Fri Feb 1 10:20:07 2008
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.geronimo.ca.helper.util.CAHelperUtils;
-import org.apache.geronimo.util.CaUtils;
+import org.apache.geronimo.crypto.CaUtils;
/**
* Servlet implementation class for Servlet: CertificateRequestServlet
Modified: geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp (original)
+++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/downloadCACertificate.jsp Fri Feb 1 10:20:07 2008
@@ -21,8 +21,8 @@
pageEncoding="ISO-8859-1"%>
<%@ page import="java.security.cert.X509Certificate" %>
<%@ page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
-<%@ page import="org.apache.geronimo.util.CaUtils"%>
-<%@ page import="org.apache.geronimo.util.CertificateUtil"%>
+<%@ page import="org.apache.geronimo.crypto.CaUtils"%>
+<%@ page import="org.apache.geronimo.crypto.CertificateUtil"%>
<%
X509Certificate cert = (X509Certificate) CAHelperUtils.getCertificateStore().getCACertificate();
request.setAttribute("cert", cert);
Modified: geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/installPersonalCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/installPersonalCertificate.jsp?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/installPersonalCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/src/main/webapp/installPersonalCertificate.jsp Fri Feb 1 10:20:07 2008
@@ -21,8 +21,8 @@
pageEncoding="ISO-8859-1"%>
<%@ page import="java.security.cert.Certificate" %>
<%@ page import="org.apache.geronimo.ca.helper.util.CAHelperUtils"%>
-<%@ page import="org.apache.geronimo.util.CaUtils"%>
-<%@ page import="org.apache.geronimo.util.CertificateUtil"%>
+<%@ page import="org.apache.geronimo.crypto.CaUtils"%>
+<%@ page import="org.apache.geronimo.crypto.CertificateUtil"%>
<%@ page import="org.apache.geronimo.management.geronimo.*"%>
<%@ page import="java.math.BigInteger"%>
<%
Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Fri Feb 1 10:20:07 2008
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-util</artifactId>
+ <artifactId>geronimo-crypto</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java Fri Feb 1 10:20:07 2008
@@ -34,8 +34,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.util.CaUtils;
-import org.apache.geronimo.util.CertificateUtil;
+import org.apache.geronimo.crypto.CaUtils;
+import org.apache.geronimo.crypto.CertificateUtil;
/**
* Handler for the CA details screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java Fri Feb 1 10:20:07 2008
@@ -47,7 +47,7 @@
import org.apache.geronimo.security.ca.FileCertificateStore;
import org.apache.geronimo.security.ca.GeronimoCertificationAuthority;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.KeystoreUtil;
+import org.apache.geronimo.crypto.KeystoreUtil;
/**
* Handler for the CA confirmation screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java Fri Feb 1 10:20:07 2008
@@ -38,8 +38,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.util.CaUtils;
-import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.CaUtils;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
/**
* Handler for Confirm Client Certificate Issue screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java Fri Feb 1 10:20:07 2008
@@ -32,8 +32,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificateRequestStore;
-import org.apache.geronimo.util.CaUtils;
-import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.CaUtils;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
/**
* Handler for "Requests to be fulfilled" screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java Fri Feb 1 10:20:07 2008
@@ -32,8 +32,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificateRequestStore;
-import org.apache.geronimo.util.CaUtils;
-import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.CaUtils;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
/**
* Handler for "Requests to be verified" screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java Fri Feb 1 10:20:07 2008
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.util.CaUtils;
+import org.apache.geronimo.crypto.CaUtils;
/**
* Handler for process CSR screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java Fri Feb 1 10:20:07 2008
@@ -35,7 +35,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
-import org.apache.geronimo.util.CertificateUtil;
+import org.apache.geronimo.crypto.CertificateUtil;
/**
* Handler for view certificate screen.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java Fri Feb 1 10:20:07 2008
@@ -36,7 +36,7 @@
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.KeystoreException;
import org.apache.geronimo.management.geronimo.KeystoreInstance;
-import org.apache.geronimo.util.CertificateUtil;
+import org.apache.geronimo.crypto.CertificateUtil;
/**
* The base class for all handlers for this portlet
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java Fri Feb 1 10:20:07 2008
@@ -20,7 +20,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.KeystoreException;
-import org.apache.geronimo.util.CertificateUtil;
+import org.apache.geronimo.crypto.CertificateUtil;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/CreateKeystoreHandler.java Fri Feb 1 10:20:07 2008
@@ -27,7 +27,7 @@
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.management.geronimo.KeystoreException;
import org.apache.geronimo.management.geronimo.KeystoreInstance;
-import org.apache.geronimo.util.KeystoreUtil;
+import org.apache.geronimo.crypto.KeystoreUtil;
/**
* Handler for creating a keystore
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Fri Feb 1 10:20:07 2008
@@ -52,7 +52,7 @@
import org.apache.geronimo.management.geronimo.WebManager;
import org.apache.geronimo.management.geronimo.WebManager.ConnectorAttribute;
import org.apache.geronimo.management.geronimo.WebManager.ConnectorType;
-import org.apache.geronimo.util.KeystoreUtil;
+import org.apache.geronimo.crypto.KeystoreUtil;
/**
* A portlet that lets you list, add, remove, start, stop, restart and edit web
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java Fri Feb 1 10:20:07 2008
@@ -53,13 +53,13 @@
import org.apache.geronimo.gbean.WaitingException;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.asn1.ASN1Set;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.x509.X509Name;
-import org.apache.geronimo.util.encoders.Base64;
-import org.apache.geronimo.util.jce.PKCS10CertificationRequest;
-import org.apache.geronimo.util.jce.X509Principal;
-import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
+import org.apache.geronimo.crypto.asn1.ASN1Set;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.encoders.Base64;
+import org.apache.geronimo.crypto.jce.PKCS10CertificationRequest;
+import org.apache.geronimo.crypto.jce.X509Principal;
+import org.apache.geronimo.crypto.jce.X509V1CertificateGenerator;
public class KeyStoreGBean implements GBeanLifecycle {
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java Fri Feb 1 10:20:07 2008
@@ -44,10 +44,10 @@
import org.apache.geronimo.security.jaas.LoginModuleGBean;
import org.apache.geronimo.security.jaas.LoginModuleSettings;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.util.encoders.Base64;
-import org.apache.geronimo.util.encoders.HexTranslator;
-import org.apache.geronimo.util.SimpleEncryption;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.encoders.Base64;
+import org.apache.geronimo.crypto.encoders.HexTranslator;
+import org.apache.geronimo.crypto.SimpleEncryption;
+import org.apache.geronimo.crypto.EncryptionManager;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/Util.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/Util.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/Util.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/Util.java Fri Feb 1 10:20:07 2008
@@ -44,11 +44,11 @@
import javax.rmi.PortableRemoteObject;
import org.apache.geronimo.corba.ORBConfiguration;
-import org.apache.geronimo.util.asn1.DERInputStream;
-import org.apache.geronimo.util.asn1.DERObjectIdentifier;
-import org.apache.geronimo.util.asn1.DEROutputStream;
-import org.apache.geronimo.util.asn1.x509.GeneralName;
-import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.crypto.asn1.DERInputStream;
+import org.apache.geronimo.crypto.asn1.DERObjectIdentifier;
+import org.apache.geronimo.crypto.asn1.DEROutputStream;
+import org.apache.geronimo.crypto.asn1.x509.GeneralName;
+import org.apache.geronimo.crypto.asn1.x509.X509Name;
import org.omg.CORBA.Any;
import org.omg.CORBA.ORB;
import org.omg.CORBA.UserException;
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java Fri Feb 1 10:20:07 2008
@@ -42,7 +42,7 @@
import org.apache.geronimo.monitoring.MasterRemoteControlRemote;
import org.apache.geronimo.monitoring.console.util.DBManager;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
public class MRCConnector {
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Fri Feb 1 10:20:07 2008
@@ -33,7 +33,7 @@
import javax.portlet.RenderResponse;
import org.apache.geronimo.monitoring.console.util.DBManager;
-import org.apache.geronimo.util.EncryptionManager;
+import org.apache.geronimo.crypto.EncryptionManager;
/**
* STATS
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp Fri Feb 1 10:20:07 2008
@@ -32,7 +32,7 @@
<%@ page import="java.sql.SQLException" %>
<%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
<%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
-<%@ page import="org.apache.geronimo.util.EncryptionManager" %>
+<%@ page import="org.apache.geronimo.crypto.EncryptionManager" %>
<portlet:defineObjects/>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Fri Feb 1 10:20:07 2008
@@ -56,7 +56,7 @@
import org.apache.geronimo.tomcat.connector.Https11ConnectorGBean;
import org.apache.geronimo.tomcat.connector.Https11NIOConnectorGBean;
import org.apache.geronimo.tomcat.connector.TomcatWebConnector;
-import org.apache.geronimo.util.KeystoreUtil;
+import org.apache.geronimo.crypto.KeystoreUtil;
/**
* Tomcat implementation of the WebManager management API. Knows how to
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java?rev=617588&r1=617587&r2=617588&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ContainerTest.java Fri Feb 1 10:20:07 2008
@@ -23,7 +23,7 @@
import java.net.URL;
import org.apache.geronimo.tomcat.app.MockWebServiceContainer;
-import org.apache.geronimo.util.encoders.Base64;
+import org.apache.geronimo.crypto.encoders.Base64;
/**