[Carbon-dev] svn commit r16012 - in trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security: . util

[svn at wso2.org]

Author: dimuthul
Date: Wed Apr 23 00:45:20 2008
New Revision: 16012

Log:

Adding security resources stuff.



Modified:
   trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/Initializer.java
   trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/SecurityScenarioConfigAdmin.java
   trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/util/ServerCrypto.java

Modified: trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/Initializer.java
==============================================================================
--- trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/Initializer.java	(original)
+++ trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/Initializer.java	Wed Apr 23 00:45:20 2008
@@ -21,7 +21,7 @@
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.wso2.carbon.registry.RegistryService;
+import org.wso2.carbon.registry.service.RegistryService;
 import org.wso2.registry.Registry;
 import org.wso2.registry.Resource;
 import org.wso2.registry.ResourceImpl;

Modified: trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/SecurityScenarioConfigAdmin.java
==============================================================================
--- trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/SecurityScenarioConfigAdmin.java	(original)
+++ trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/SecurityScenarioConfigAdmin.java	Wed Apr 23 00:45:20 2008
@@ -39,7 +39,7 @@
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.wso2.carbon.RegistryResources;
 import org.wso2.carbon.persistence.PersistenceManager;
-import org.wso2.carbon.userstore.UMConstants;
+import org.wso2.carbon.userstore.USRegistryConstants;
 import org.wso2.carbon.userstore.UserStoreConfigAdmin;
 import org.wso2.registry.Association;
 import org.wso2.registry.Registry;
@@ -157,7 +157,8 @@
                             service.getAxisServiceGroup().getServiceGroupName() +
                             RegistryResources.SERVICES + serviceName;
        
-        String userStorePath = UMConstants.RegistryConstants.AUTHENTICATOR_COLLECTION +storeType+userStore;
+        //String userStorePath = USRegistryConstants.RegistryConstantsStuff.Associations +storeType+userStore;
+        String userStorePath = null;
         registry.addAssociation(RegistryResources.Associations.USER_STORE, servicePath, userStorePath);
         applyEndPointPolicy(serviceName, SecurityConstants.USERNAME_TOKEN_SCENARIO_ID, 
                 new Properties());

Modified: trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/util/ServerCrypto.java
==============================================================================
--- trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/util/ServerCrypto.java	(original)
+++ trunk/carbon-components/org.carbon.modules.security/src/org/wso2/security/util/ServerCrypto.java	Wed Apr 23 00:45:20 2008
@@ -16,57 +16,16 @@
 
 package org.wso2.security.util;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.Key;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertPathValidatorException;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.PKIXParameters;
 import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.ListenerManager;
-import org.apache.commons.discovery.Resource;
-import org.apache.commons.discovery.ResourceIterator;
-import org.apache.commons.discovery.jdk.JDKHooks;
-import org.apache.commons.discovery.resource.DiscoverResources;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
 import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.CredentialException;
 import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.X509NameTokenizer;
 
 
 /**