[Registry-dev] svn commit r16835 - in trunk/registry/modules/core/src/main/java/org/wso2/registry: . app config jdbc jdbc/dao jdbc/filecache jdbc/handlers jdbc/handlers/builtin jdbc/handlers/builtin/utils jdbc/handlers/filters jdbc/queries jdbc/realm jdbc/realm/pathbased jdbc/utils/creators secure servlet servlet/utils session users/accesscontrol users/def users/def/util users/verifier utils

[svn at wso2.org]

Author: chathura
Date: Sun May 11 23:37:21 2008
New Revision: 16835

Log:

Code clean up.
Removed unused imports.
Removed the deprecated Repository class. Now the repo functionality is devided between the new Repository and VersionRepository classes.



Removed:
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/OldRepository.java
Modified:
   trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/Resource.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImpl.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImporter.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceVersionImpl.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/Property.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAdapter.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryProvider.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryResolver.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteResourceImpl.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/ResourceTarget.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StackTraceResponseContext.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StringResponseContext.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/config/HandlerConfiguration.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfigurationProcessor.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryContext.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/EmbeddedRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryEmbeddedRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryJDBCRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/VersionRepository.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/AssociationDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/CommentsDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/LogsDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RestoreUtilDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/filecache/RegistryFileInputStream.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/Handler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/HandlerManager.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/RequestContext.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/Axis2RepositoryHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentCollectionURLHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentURLHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingCollectionURLHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingURLHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SQLQueryHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SynapseRepositoryHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagCollectionURLHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagURLHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/WSDLMediaTypeHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDMediaTypeHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDValidationHandler.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/SchemaFileProcessor.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/WSDLFileProcessor.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/Filter.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/MediaTypeMatcher.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/URLMatcher.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessor.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryAccessControlAdmin.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAccessControlAdmin.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAuthorizer.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedRegistryRealm.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreator.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreatorFactory.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/HSQLDatabaseCreator.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryUserManager.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/UserUtil.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/session/UserRegistry.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLAdminChecker.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreAdmin.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreReader.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/AuthorizingRealm.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAccessControlAdmin.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthenticator.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthorizer.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultRealm.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreAdmin.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreReader.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDataSupplierImpl.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDatabaseUtil.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/users/verifier/EmailVerifier.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtil.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtils.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/RegistryUtils.java
   trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/SchemaValidator.java

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java	Sun May 11 23:37:21 2008
@@ -19,9 +19,10 @@
 
 package org.wso2.registry;
 
-import org.wso2.registry.jdbc.handlers.filters.Filter;
-import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.config.RegistryContext;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.filters.Filter;
+
 import java.util.Date;
 import java.util.Map;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/Resource.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/Resource.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/Resource.java	Sun May 11 23:37:21 2008
@@ -15,10 +15,10 @@
  */
 package org.wso2.registry;
 
+import java.io.InputStream;
 import java.util.Date;
-import java.util.Properties;
 import java.util.List;
-import java.io.InputStream;
+import java.util.Properties;
 
 public interface Resource {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImpl.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImpl.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImpl.java	Sun May 11 23:37:21 2008
@@ -26,11 +26,14 @@
 import org.wso2.registry.utils.UUIDGenerator;
 
 import javax.sql.DataSource;
-import java.sql.Timestamp;
+import java.io.*;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.*;
-import java.io.*;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
 
 /**
  * Represents any file or collection stored in the registry. It encapsulates both the content

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImporter.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImporter.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceImporter.java	Sun May 11 23:37:21 2008
@@ -22,7 +22,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceVersionImpl.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceVersionImpl.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/ResourceVersionImpl.java	Sun May 11 23:37:21 2008
@@ -16,14 +16,14 @@
 
 package org.wso2.registry;
 
-import org.wso2.registry.jdbc.dao.ResourceVersionDAO;
-import org.wso2.registry.jdbc.utils.Transaction;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.jdbc.dao.ResourceVersionDAO;
+import org.wso2.registry.jdbc.utils.Transaction;
 
-import java.io.InputStream;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.SQLException;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java	Sun May 11 23:37:21 2008
@@ -24,26 +24,24 @@
 import org.apache.abdera.parser.Parser;
 import org.apache.abdera.protocol.server.RequestContext;
 import org.apache.abdera.protocol.server.ResponseContext;
-import org.apache.abdera.protocol.server.context.EmptyResponseContext;
-import org.apache.abdera.protocol.server.context.BaseResponseContext;
 import org.apache.abdera.protocol.server.context.AbstractResponseContext;
+import org.apache.abdera.protocol.server.context.BaseResponseContext;
+import org.apache.abdera.protocol.server.context.EmptyResponseContext;
 import org.apache.abdera.util.EntityTag;
 import org.apache.abdera.util.MimeTypeHelper;
 import org.apache.axiom.om.util.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Comment;
 import org.wso2.registry.*;
 import org.wso2.registry.Collection;
-import org.wso2.registry.session.UserRegistry;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreException;
+import org.wso2.registry.Comment;
 import org.wso2.registry.exceptions.ResourceNotFoundException;
 import org.wso2.registry.i18n.Messages;
-import org.wso2.registry.jdbc.realm.RegistryRealm;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
 import org.wso2.registry.secure.AuthorizationFailedException;
-import org.wso2.registry.secure.SecureRegistry;
+import org.wso2.registry.session.UserRegistry;
+import org.wso2.registry.users.UserRealm;
+import org.wso2.registry.users.UserStoreException;
 
 import javax.activation.MimeType;
 import javax.xml.namespace.QName;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/Property.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/Property.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/Property.java	Sun May 11 23:37:21 2008
@@ -23,8 +23,6 @@
 import org.apache.abdera.model.ExtensibleElementWrapper;
 
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Iterator;
 
 public class Property extends ExtensibleElementWrapper {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAdapter.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAdapter.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAdapter.java	Sun May 11 23:37:21 2008
@@ -18,9 +18,9 @@
 import org.apache.abdera.util.MimeTypeHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.*;
 import org.wso2.registry.Collection;
 import org.wso2.registry.Comment;
-import org.wso2.registry.*;
 import org.wso2.registry.exceptions.ResourceNotFoundException;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryProvider.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryProvider.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryProvider.java	Sun May 11 23:37:21 2008
@@ -15,20 +15,21 @@
  */
 package org.wso2.registry.app;
 
-import org.apache.abdera.protocol.server.*;
+import org.apache.abdera.protocol.server.CollectionAdapter;
+import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.TargetType;
 import org.apache.abdera.protocol.server.impl.AbstractWorkspaceProvider;
 import org.apache.abdera.protocol.server.impl.SimpleWorkspaceInfo;
 import org.apache.abdera.protocol.server.impl.TemplateTargetBuilder;
 import org.wso2.registry.config.RegistryContext;
-import org.wso2.registry.config.RegistryConfigurationProcessor;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
 import org.wso2.registry.jdbc.InMemoryEmbeddedRegistry;
 import org.wso2.registry.jdbc.realm.InMemoryRegistryRealm;
 import org.wso2.registry.jdbc.realm.RegistryRealm;
 
-import java.io.InputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.InputStream;
 
 public class RegistryProvider extends AbstractWorkspaceProvider {
     RegistryAdapter adapter;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryResolver.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryResolver.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryResolver.java	Sun May 11 23:37:21 2008
@@ -15,26 +15,25 @@
  */
 package org.wso2.registry.app;
 
-import org.apache.abdera.protocol.server.Target;
+import org.apache.abdera.protocol.Request;
+import org.apache.abdera.protocol.Resolver;
 import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.Target;
 import org.apache.abdera.protocol.server.TargetType;
-import org.apache.abdera.protocol.server.servlet.ServletRequestContext;
 import org.apache.abdera.protocol.server.impl.SimpleTarget;
-import org.apache.abdera.protocol.Resolver;
-import org.apache.abdera.protocol.Request;
+import org.apache.abdera.protocol.server.servlet.ServletRequestContext;
+import org.apache.axiom.om.util.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.util.Base64;
 import org.wso2.registry.*;
-import org.wso2.registry.jdbc.EmbeddedRegistry;
 import org.wso2.registry.exceptions.ResourceNotFoundException;
+import org.wso2.registry.jdbc.EmbeddedRegistry;
 
 import javax.activation.MimeType;
-import javax.servlet.http.HttpSession;
-import java.util.Map;
-import java.util.HashMap;
-import java.net.URLDecoder;
 import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
 
 public class RegistryResolver implements Resolver<Target> {
     private Log log = LogFactory.getLog(RegistryResolver.class);

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java	Sun May 11 23:37:21 2008
@@ -19,8 +19,8 @@
 package org.wso2.registry.app;
 
 import org.apache.abdera.Abdera;
-import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.factory.Factory;
+import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.*;
 import org.apache.abdera.protocol.Response;
 import org.apache.abdera.protocol.client.AbderaClient;
@@ -29,20 +29,22 @@
 import org.apache.axiom.om.util.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Comment;
 import org.wso2.registry.*;
 import org.wso2.registry.Collection;
-import org.wso2.registry.jdbc.handlers.filters.Filter;
-import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.Comment;
 import org.wso2.registry.config.RegistryContext;
 import org.wso2.registry.exceptions.ResourceNotFoundException;
 import org.wso2.registry.i18n.Messages;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.filters.Filter;
 
 import javax.xml.namespace.QName;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.*;
 
 public class RemoteRegistry implements Registry, APPConstants {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteResourceImpl.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteResourceImpl.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteResourceImpl.java	Sun May 11 23:37:21 2008
@@ -15,11 +15,11 @@
  */
 package org.wso2.registry.app;
 
-import org.wso2.registry.ResourceImpl;
 import org.wso2.registry.RegistryException;
+import org.wso2.registry.ResourceImpl;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/ResourceTarget.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/ResourceTarget.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/ResourceTarget.java	Sun May 11 23:37:21 2008
@@ -15,8 +15,8 @@
  */
 package org.wso2.registry.app;
 
-import org.apache.abdera.protocol.server.TargetType;
 import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.TargetType;
 import org.apache.abdera.protocol.server.impl.SimpleTarget;
 import org.wso2.registry.Resource;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StackTraceResponseContext.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StackTraceResponseContext.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StackTraceResponseContext.java	Sun May 11 23:37:21 2008
@@ -18,9 +18,9 @@
 import org.apache.abdera.protocol.server.context.SimpleResponseContext;
 import org.wso2.registry.secure.AuthorizationFailedException;
 
-import java.io.Writer;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Writer;
 
 public class StackTraceResponseContext extends SimpleResponseContext {
     /** Set this to false to squelch stack traces */

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StringResponseContext.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StringResponseContext.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/StringResponseContext.java	Sun May 11 23:37:21 2008
@@ -15,7 +15,6 @@
  */
 package org.wso2.registry.app;
 
-import org.apache.abdera.Abdera;
 import org.apache.abdera.protocol.server.context.AbstractResponseContext;
 
 import java.io.*;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/config/HandlerConfiguration.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/config/HandlerConfiguration.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/config/HandlerConfiguration.java	Sun May 11 23:37:21 2008
@@ -16,8 +16,8 @@
 
 package org.wso2.registry.config;
 
-import org.wso2.registry.jdbc.handlers.filters.Filter;
 import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.filters.Filter;
 
 public class HandlerConfiguration {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfigurationProcessor.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfigurationProcessor.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryConfigurationProcessor.java	Sun May 11 23:37:21 2008
@@ -24,19 +24,17 @@
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.RegistryException;
 import org.wso2.registry.Aspect;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.i18n.Messages;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.filters.Filter;
-import org.wso2.registry.i18n.Messages;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.lang.reflect.Method;
+import java.util.Iterator;
 
 public class RegistryConfigurationProcessor {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryContext.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryContext.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/config/RegistryContext.java	Sun May 11 23:37:21 2008
@@ -21,16 +21,16 @@
 import org.wso2.registry.Aspect;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.i18n.Messages;
-import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
+import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.utils.RegistryDataSource;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreator;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreatorFactory;
 import org.wso2.registry.secure.HSQLDBInitializer;
 
 import javax.sql.DataSource;
-import java.util.*;
 import java.io.InputStream;
+import java.util.*;
 
 public class RegistryContext {
     public interface RegURLSupplier {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/EmbeddedRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/EmbeddedRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/EmbeddedRegistry.java	Sun May 11 23:37:21 2008
@@ -16,8 +16,8 @@
 
 package org.wso2.registry.jdbc;
 
-import org.wso2.registry.RegistryException;
 import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
 import org.wso2.registry.config.RegistryContext;
 import org.wso2.registry.jdbc.realm.RegistryRealm;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreator;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryEmbeddedRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryEmbeddedRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryEmbeddedRegistry.java	Sun May 11 23:37:21 2008
@@ -16,9 +16,9 @@
 
 package org.wso2.registry.jdbc;
 
-import org.wso2.registry.jdbc.utils.RegistryDataSource;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.config.RegistryContext;
+import org.wso2.registry.jdbc.utils.RegistryDataSource;
 import org.wso2.registry.users.UserRealm;
 
 public class InMemoryEmbeddedRegistry extends EmbeddedRegistry {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryJDBCRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryJDBCRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/InMemoryJDBCRegistry.java	Sun May 11 23:37:21 2008
@@ -17,15 +17,12 @@
 package org.wso2.registry.jdbc;
 
 import org.wso2.registry.RegistryException;
-import org.wso2.registry.i18n.Messages;
 import org.wso2.registry.jdbc.realm.RegistryRealm;
 import org.wso2.registry.jdbc.utils.RegistryDataSource;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreator;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreatorFactory;
 
 import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
 
 public class InMemoryJDBCRegistry extends JDBCRegistry {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java	Sun May 11 23:37:21 2008
@@ -21,20 +21,19 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Collection;
 import org.wso2.registry.*;
 import org.wso2.registry.config.RegistryContext;
-import org.wso2.registry.jdbc.dao.*;
-import org.wso2.registry.jdbc.handlers.HandlerManager;
+import org.wso2.registry.jdbc.dao.ResourceDAO;
+import org.wso2.registry.jdbc.filecache.FileManager;
 import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.HandlerManager;
+import org.wso2.registry.jdbc.handlers.builtin.*;
+import org.wso2.registry.jdbc.handlers.filters.Filter;
 import org.wso2.registry.jdbc.handlers.filters.MediaTypeMatcher;
 import org.wso2.registry.jdbc.handlers.filters.URLMatcher;
-import org.wso2.registry.jdbc.handlers.filters.Filter;
-import org.wso2.registry.jdbc.handlers.builtin.*;
 import org.wso2.registry.jdbc.queries.QueryProcessorManager;
 import org.wso2.registry.jdbc.realm.RegistryRealm;
 import org.wso2.registry.jdbc.utils.Transaction;
-import org.wso2.registry.jdbc.filecache.FileManager;
 import org.wso2.registry.session.CurrentSession;
 import org.wso2.registry.users.UserRealm;
 import org.wso2.registry.users.UserStoreException;
@@ -45,8 +44,8 @@
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Map;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * JDBC based implementation of the Registry. This will be used mostly as the back-end by other

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/VersionRepository.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/VersionRepository.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/VersionRepository.java	Sun May 11 23:37:21 2008
@@ -16,21 +16,21 @@
 
 package org.wso2.registry.jdbc;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.*;
 import org.wso2.registry.jdbc.dao.ResourceDAO;
 import org.wso2.registry.jdbc.dao.ResourceVersionDAO;
 import org.wso2.registry.jdbc.dao.RestoreUtilDAO;
 import org.wso2.registry.jdbc.dataobjects.ResourceDO;
-import org.wso2.registry.utils.VersionedPath;
 import org.wso2.registry.utils.RegistryUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.utils.VersionedPath;
 
 import javax.sql.DataSource;
-import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 public class VersionRepository {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/AssociationDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/AssociationDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/AssociationDAO.java	Sun May 11 23:37:21 2008
@@ -16,16 +16,16 @@
 
 package org.wso2.registry.jdbc.dao;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.Association;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.jdbc.utils.Transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
-import java.sql.SQLException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 
 public class AssociationDAO {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/CommentsDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/CommentsDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/CommentsDAO.java	Sun May 11 23:37:21 2008
@@ -19,18 +19,17 @@
 
 package org.wso2.registry.jdbc.dao;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.Comment;
-import org.wso2.registry.RegistryException;
 import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
 import org.wso2.registry.jdbc.DatabaseConstants;
 import org.wso2.registry.jdbc.utils.Transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 public class CommentsDAO {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/LogsDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/LogsDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/LogsDAO.java	Sun May 11 23:37:21 2008
@@ -16,12 +16,12 @@
 
 package org.wso2.registry.jdbc.dao;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.LogEntry;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.jdbc.DatabaseConstants;
 import org.wso2.registry.jdbc.utils.Transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import javax.sql.DataSource;
 import java.sql.*;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RatingsDAO.java	Sun May 11 23:37:21 2008
@@ -19,13 +19,12 @@
 
 package org.wso2.registry.jdbc.dao;
 
-import org.wso2.registry.jdbc.DatabaseConstants;
-import org.wso2.registry.jdbc.utils.Transaction;
-import org.wso2.registry.jdbc.dataobjects.RatingDO;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.session.CurrentSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.jdbc.DatabaseConstants;
+import org.wso2.registry.jdbc.dataobjects.RatingDO;
+import org.wso2.registry.jdbc.utils.Transaction;
 
 import java.sql.*;
 import java.util.ArrayList;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceDAO.java	Sun May 11 23:37:21 2008
@@ -20,11 +20,11 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.*;
 import org.wso2.registry.Collection;
-import org.wso2.registry.jdbc.utils.Transaction;
+import org.wso2.registry.jdbc.dataobjects.ResourceDO;
 import org.wso2.registry.jdbc.filecache.FileManager;
+import org.wso2.registry.jdbc.utils.Transaction;
 import org.wso2.registry.session.CurrentSession;
 import org.wso2.registry.utils.AuthorizationUtils;
-import org.wso2.registry.jdbc.dataobjects.ResourceDO;
 
 import java.io.*;
 import java.sql.*;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java	Sun May 11 23:37:21 2008
@@ -16,18 +16,18 @@
 
 package org.wso2.registry.jdbc.dao;
 
-import org.wso2.registry.jdbc.utils.Transaction;
-import org.wso2.registry.jdbc.filecache.FileManager;
-import org.wso2.registry.jdbc.dataobjects.ResourceDO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.*;
 import org.wso2.registry.Collection;
+import org.wso2.registry.jdbc.dataobjects.ResourceDO;
+import org.wso2.registry.jdbc.filecache.FileManager;
+import org.wso2.registry.jdbc.utils.Transaction;
 import org.wso2.registry.utils.AuthorizationUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
+import java.io.*;
 import java.sql.*;
 import java.util.*;
-import java.io.*;
 
 public class ResourceVersionDAO {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RestoreUtilDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RestoreUtilDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/RestoreUtilDAO.java	Sun May 11 23:37:21 2008
@@ -16,22 +16,21 @@
 
 package org.wso2.registry.jdbc.dao;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.RegistryException;
-import org.wso2.registry.utils.RegistryUtils;
-import org.wso2.registry.jdbc.dataobjects.ResourceDO;
 import org.wso2.registry.jdbc.dataobjects.PropertyDO;
+import org.wso2.registry.jdbc.dataobjects.ResourceDO;
 import org.wso2.registry.jdbc.utils.Transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.sql.ResultSet;
-import java.util.List;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 public class RestoreUtilDAO {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/TagsDAO.java	Sun May 11 23:37:21 2008
@@ -19,17 +19,15 @@
 
 package org.wso2.registry.jdbc.dao;
 
-import org.wso2.registry.RegistryConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryException;
 import org.wso2.registry.Tag;
 import org.wso2.registry.TaggedResourcePath;
-import org.wso2.registry.RegistryException;
 import org.wso2.registry.jdbc.DatabaseConstants;
-import org.wso2.registry.jdbc.utils.Transaction;
 import org.wso2.registry.jdbc.dataobjects.TaggingDO;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.jdbc.utils.Transaction;
 
-import javax.sql.DataSource;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java	Sun May 11 23:37:21 2008
@@ -16,21 +16,6 @@
 
 package org.wso2.registry.jdbc.dao;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.*;
-import org.wso2.registry.Collection;
-import org.wso2.registry.jdbc.DatabaseConstants;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.utils.AuthorizationUtil;
-
-import javax.activation.DataHandler;
-import javax.sql.DataSource;
-import java.io.*;
-import java.sql.*;
-import java.sql.Date;
-import java.util.*;
-
 public class VersionedResourceDAO {
 
 //<<<<<<< .mine

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/filecache/RegistryFileInputStream.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/filecache/RegistryFileInputStream.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/filecache/RegistryFileInputStream.java	Sun May 11 23:37:21 2008
@@ -16,10 +16,8 @@
 
 package org.wso2.registry.jdbc.filecache;
 
-import org.wso2.registry.jdbc.filecache.FileManager;
-
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 public class RegistryFileInputStream extends InputStream {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/Handler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/Handler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/Handler.java	Sun May 11 23:37:21 2008
@@ -16,18 +16,13 @@
 
 package org.wso2.registry.jdbc.handlers;
 
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.jdbc.dao.VersionedResourceDAO;
-import org.wso2.registry.jdbc.dao.ResourceDAO;
-import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.Registry;
-import org.wso2.registry.ResourceImpl;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.Repository;
+import org.wso2.registry.jdbc.dao.ResourceDAO;
 import org.wso2.registry.utils.AuthorizationUtil;
 
-import javax.sql.DataSource;
-
 /**
  * Base class of all handler implementations. Provides the methods that handlers should implement.
  * This class also provides the datasource, user realm, registry and repository instances to be

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/HandlerManager.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/HandlerManager.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/HandlerManager.java	Sun May 11 23:37:21 2008
@@ -21,9 +21,7 @@
 import org.wso2.registry.Resource;
 import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.handlers.filters.Filter;
-import org.wso2.registry.users.UserRealm;
 
-import javax.sql.DataSource;
 import java.util.*;
 
 public class HandlerManager {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/RequestContext.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/RequestContext.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/RequestContext.java	Sun May 11 23:37:21 2008
@@ -16,9 +16,9 @@
 
 package org.wso2.registry.jdbc.handlers;
 
-import org.wso2.registry.Resource;
 import org.wso2.registry.Collection;
 import org.wso2.registry.Registry;
+import org.wso2.registry.Resource;
 
 /**
  * Objects of this class contains the information about the current request to the registry.

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/Axis2RepositoryHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/Axis2RepositoryHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/Axis2RepositoryHandler.java	Sun May 11 23:37:21 2008
@@ -16,13 +16,10 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.*;
+import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.jdbc.Repository;
-import org.wso2.registry.*;
-import org.wso2.registry.users.UserRealm;
-
-import javax.sql.DataSource;
 
 public class Axis2RepositoryHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentCollectionURLHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentCollectionURLHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentCollectionURLHandler.java	Sun May 11 23:37:21 2008
@@ -16,9 +16,9 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.*;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.*;
 
 public class CommentCollectionURLHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentURLHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentURLHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/CommentURLHandler.java	Sun May 11 23:37:21 2008
@@ -16,22 +16,18 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
-import org.wso2.registry.jdbc.handlers.Handler;
-import org.wso2.registry.jdbc.handlers.RequestContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.*;
 import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.dao.CommentsDAO;
-import org.wso2.registry.*;
-import org.wso2.registry.session.CurrentSession;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 import org.wso2.registry.secure.AuthorizationFailedException;
-import org.wso2.registry.utils.AuthorizationUtil;
+import org.wso2.registry.session.CurrentSession;
 import org.wso2.registry.users.UserRealm;
 import org.wso2.registry.users.UserStoreException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
+import org.wso2.registry.utils.AuthorizationUtil;
 
 public class CommentURLHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingCollectionURLHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingCollectionURLHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingCollectionURLHandler.java	Sun May 11 23:37:21 2008
@@ -16,20 +16,18 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
-import org.wso2.registry.jdbc.handlers.Handler;
-import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.jdbc.dao.RatingsDAO;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.CollectionImpl;
-import org.wso2.registry.RegistryConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.CollectionImpl;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.dao.RatingsDAO;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class RatingCollectionURLHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingURLHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingURLHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/RatingURLHandler.java	Sun May 11 23:37:21 2008
@@ -16,18 +16,16 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
-import org.wso2.registry.jdbc.handlers.Handler;
-import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.jdbc.dao.RatingsDAO;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.ResourceImpl;
-import org.wso2.registry.RegistryConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.ResourceImpl;
+import org.wso2.registry.jdbc.dao.RatingsDAO;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.Date;
 
 public class RatingURLHandler extends Handler {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SQLQueryHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SQLQueryHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SQLQueryHandler.java	Sun May 11 23:37:21 2008
@@ -16,10 +16,10 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
 
 public class SQLQueryHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SynapseRepositoryHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SynapseRepositoryHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/SynapseRepositoryHandler.java	Sun May 11 23:37:21 2008
@@ -16,12 +16,12 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.CollectionImpl;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.CollectionImpl;
 
 public class SynapseRepositoryHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagCollectionURLHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagCollectionURLHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagCollectionURLHandler.java	Sun May 11 23:37:21 2008
@@ -16,17 +16,15 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
-import org.wso2.registry.jdbc.handlers.Handler;
-import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.jdbc.dao.TagsDAO;
-import org.wso2.registry.jdbc.dataobjects.TaggingDO;
-import org.wso2.registry.jdbc.utils.Transaction;
-import org.wso2.registry.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.sql.Connection;
-import java.sql.SQLException;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.ResourceImpl;
+import org.wso2.registry.jdbc.dao.TagsDAO;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 
 public class TagCollectionURLHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagURLHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagURLHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/TagURLHandler.java	Sun May 11 23:37:21 2008
@@ -16,19 +16,17 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
-import org.wso2.registry.jdbc.handlers.Handler;
-import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.jdbc.dao.TagsDAO;
-import org.wso2.registry.jdbc.dataobjects.TaggingDO;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.ResourceImpl;
-import org.wso2.registry.RegistryConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.ResourceImpl;
+import org.wso2.registry.jdbc.dao.TagsDAO;
+import org.wso2.registry.jdbc.dataobjects.TaggingDO;
+import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.Date;
 
 public class TagURLHandler extends Handler {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/WSDLMediaTypeHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/WSDLMediaTypeHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/WSDLMediaTypeHandler.java	Sun May 11 23:37:21 2008
@@ -16,14 +16,13 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
 import org.wso2.registry.jdbc.handlers.builtin.utils.WSDLFileProcessor;
-import org.wso2.registry.jdbc.Repository;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.utils.AuthorizationUtil;
 import org.wso2.registry.utils.RegistryUtils;
 
 public class WSDLMediaTypeHandler extends Handler {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDMediaTypeHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDMediaTypeHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDMediaTypeHandler.java	Sun May 11 23:37:21 2008
@@ -16,14 +16,13 @@
 
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
 import org.wso2.registry.jdbc.handlers.builtin.utils.SchemaFileProcessor;
-import org.wso2.registry.jdbc.Repository;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.utils.AuthorizationUtil;
 import org.wso2.registry.utils.RegistryUtils;
 
 public class XSDMediaTypeHandler extends Handler {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDValidationHandler.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDValidationHandler.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/XSDValidationHandler.java	Sun May 11 23:37:21 2008
@@ -18,14 +18,14 @@
  */
 package org.wso2.registry.jdbc.handlers.builtin;
 
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
 import org.wso2.registry.jdbc.handlers.Handler;
 import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
 import org.wso2.registry.utils.SchemaValidator;
 
-import java.io.InputStream;
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 
 public class XSDValidationHandler extends Handler {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/SchemaFileProcessor.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/SchemaFileProcessor.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/SchemaFileProcessor.java	Sun May 11 23:37:21 2008
@@ -16,16 +16,16 @@
 
 package org.wso2.registry.jdbc.handlers.builtin.utils;
 
-import org.wso2.registry.jdbc.Repository;
-import org.wso2.registry.*;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaExternal;
+import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.wso2.registry.*;
+import org.wso2.registry.jdbc.Repository;
 import org.xml.sax.InputSource;
 
-import java.util.*;
 import java.io.ByteArrayOutputStream;
+import java.util.*;
 
 public class SchemaFileProcessor {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/WSDLFileProcessor.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/WSDLFileProcessor.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/builtin/utils/WSDLFileProcessor.java	Sun May 11 23:37:21 2008
@@ -16,25 +16,25 @@
 
 package org.wso2.registry.jdbc.handlers.builtin.utils;
 
-import org.wso2.registry.jdbc.Repository;
-import org.wso2.registry.*;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
 import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.wso2.registry.*;
+import org.wso2.registry.jdbc.Repository;
 
-import javax.wsdl.xml.WSDLReader;
-import javax.wsdl.xml.WSDLWriter;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.WSDLException;
 import javax.wsdl.Definition;
 import javax.wsdl.Import;
 import javax.wsdl.Types;
+import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.schema.Schema;
-import java.util.*;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.wsdl.xml.WSDLWriter;
 import java.io.ByteArrayOutputStream;
+import java.util.*;
 
 public class WSDLFileProcessor {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/Filter.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/Filter.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/Filter.java	Sun May 11 23:37:21 2008
@@ -16,9 +16,9 @@
 
 package org.wso2.registry.jdbc.handlers.filters;
 
-import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.jdbc.Repository;
 import org.wso2.registry.RegistryException;
+import org.wso2.registry.jdbc.Repository;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 
 /**
  * Base class of all filter implementations. All handlers have to be registered in the jdbc registry

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/MediaTypeMatcher.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/MediaTypeMatcher.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/MediaTypeMatcher.java	Sun May 11 23:37:21 2008
@@ -16,10 +16,10 @@
 
 package org.wso2.registry.jdbc.handlers.filters;
 
-import org.wso2.registry.jdbc.handlers.RequestContext;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
 import org.wso2.registry.Collection;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 import org.wso2.registry.utils.RegistryUtils;
 
 public class MediaTypeMatcher extends Filter {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/URLMatcher.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/URLMatcher.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/handlers/filters/URLMatcher.java	Sun May 11 23:37:21 2008
@@ -16,8 +16,8 @@
 
 package org.wso2.registry.jdbc.handlers.filters;
 
-import org.wso2.registry.jdbc.handlers.RequestContext;
 import org.wso2.registry.RegistryException;
+import org.wso2.registry.jdbc.handlers.RequestContext;
 
 public class URLMatcher extends Filter {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessor.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessor.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessor.java	Sun May 11 23:37:21 2008
@@ -16,10 +16,9 @@
 
 package org.wso2.registry.jdbc.queries;
 
+import org.wso2.registry.Collection;
 import org.wso2.registry.RegistryException;
-import org.wso2.registry.ResourceImpl;
 import org.wso2.registry.Resource;
-import org.wso2.registry.Collection;
 import org.wso2.registry.users.UserRealm;
 
 import javax.sql.DataSource;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/InMemoryRegistryRealm.java	Sun May 11 23:37:21 2008
@@ -20,7 +20,6 @@
 import org.wso2.registry.jdbc.utils.RegistryDataSource;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreator;
 import org.wso2.registry.jdbc.utils.creators.DatabaseCreatorFactory;
-import org.wso2.registry.secure.HSQLDBInitializer;
 
 public class InMemoryRegistryRealm extends RegistryRealm {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryAccessControlAdmin.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryAccessControlAdmin.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryAccessControlAdmin.java	Sun May 11 23:37:21 2008
@@ -17,12 +17,8 @@
 package org.wso2.registry.jdbc.realm;
 
 import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.AccessControlAdmin;
-import org.wso2.registry.users.def.DefaultAccessControlAdmin;
-
-
-import javax.sql.DataSource;
+import org.wso2.registry.users.UserStoreException;
 
 public class RegistryAccessControlAdmin implements AccessControlAdmin {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryRealm.java	Sun May 11 23:37:21 2008
@@ -16,15 +16,14 @@
 
 package org.wso2.registry.jdbc.realm;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.authenticator.Authenticator;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.users.*;
 import org.wso2.registry.users.def.DefaultRealm;
 import org.wso2.registry.users.def.DefaultRealmConfig;
 import org.wso2.registry.utils.AuthorizationUtils;
-import org.wso2.authenticator.Authenticator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 
 import javax.sql.DataSource;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/RegistryUserStoreAdmin.java	Sun May 11 23:37:21 2008
@@ -17,12 +17,9 @@
 package org.wso2.registry.jdbc.realm;
 
 import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.UserStoreAdmin;
-import org.wso2.registry.users.def.DefaultUserStoreAdmin;
-
+import org.wso2.registry.users.UserStoreException;
 
-import javax.sql.DataSource;
 import java.util.Map;
 
 public class RegistryUserStoreAdmin implements UserStoreAdmin {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAccessControlAdmin.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAccessControlAdmin.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAccessControlAdmin.java	Sun May 11 23:37:21 2008
@@ -16,11 +16,11 @@
 
 package org.wso2.registry.jdbc.realm.pathbased;
 
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.AccessControlAdmin;
-import org.wso2.registry.jdbc.dao.ResourceDAO;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.jdbc.dao.ResourceDAO;
+import org.wso2.registry.users.AccessControlAdmin;
+import org.wso2.registry.users.UserStoreException;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAuthorizer.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAuthorizer.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedAuthorizer.java	Sun May 11 23:37:21 2008
@@ -16,12 +16,12 @@
 
 package org.wso2.registry.jdbc.realm.pathbased;
 
-import org.wso2.registry.users.Authorizer;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.jdbc.dao.ResourceDAO;
-import org.wso2.registry.RegistryConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.jdbc.dao.ResourceDAO;
+import org.wso2.registry.users.Authorizer;
+import org.wso2.registry.users.UserStoreException;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedRegistryRealm.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedRegistryRealm.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/realm/pathbased/PathBasedRegistryRealm.java	Sun May 11 23:37:21 2008
@@ -16,12 +16,11 @@
 
 package org.wso2.registry.jdbc.realm.pathbased;
 
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.jdbc.realm.RegistryRealm;
-import org.wso2.registry.users.*;
-import org.wso2.authenticator.Authenticator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.authenticator.Authenticator;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.users.*;
 
 import javax.sql.DataSource;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreator.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreator.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreator.java	Sun May 11 23:37:21 2008
@@ -16,9 +16,9 @@
 
 package org.wso2.registry.jdbc.utils.creators;
 
-import org.wso2.registry.RegistryException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryException;
 
 import javax.sql.DataSource;
 import java.sql.*;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreatorFactory.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreatorFactory.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/DatabaseCreatorFactory.java	Sun May 11 23:37:21 2008
@@ -16,14 +16,14 @@
 
 package org.wso2.registry.jdbc.utils.creators;
 
-import org.wso2.registry.RegistryException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryException;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
 
 public class DatabaseCreatorFactory {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/HSQLDatabaseCreator.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/HSQLDatabaseCreator.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/utils/creators/HSQLDatabaseCreator.java	Sun May 11 23:37:21 2008
@@ -16,9 +16,6 @@
 
 package org.wso2.registry.jdbc.utils.creators;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import javax.sql.DataSource;
 
 public class HSQLDatabaseCreator extends DatabaseCreator {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java	Sun May 11 23:37:21 2008
@@ -22,7 +22,6 @@
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.def.util.DefaultDatabaseUtil;
 
-
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryUserManager.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryUserManager.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryUserManager.java	Sun May 11 23:37:21 2008
@@ -23,12 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.RegistryConstants;
 import org.wso2.registry.RegistryException;
-import org.wso2.registry.users.AccessControlAdmin;
-import org.wso2.registry.users.Authorizer;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreAdmin;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.UserStoreReader;
+import org.wso2.registry.users.*;
 import org.wso2.registry.users.accesscontrol.AuthorizingRealm;
 import org.wso2.registry.users.accesscontrol.AuthorizingRealmConfig;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java	Sun May 11 23:37:21 2008
@@ -19,27 +19,6 @@
 
 package org.wso2.registry.secure;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.authenticator.Authenticator;
-import org.wso2.authenticator.AuthenticatorException;
-import org.wso2.registry.*;
-import org.wso2.registry.jdbc.handlers.filters.Filter;
-import org.wso2.registry.jdbc.handlers.Handler;
-import org.wso2.registry.session.CurrentSession;
-import org.wso2.registry.config.RegistryContext;
-import org.wso2.registry.exceptions.ResourceNotFoundException;
-import org.wso2.registry.users.Authorizer;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.accesscontrol.AuthorizingRealm;
-import org.wso2.registry.users.accesscontrol.AuthorizingRealmConfig;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Registry implementation to perform authentication and authorization. Each
  * user should use a separate instance of the SecureRegistry initialized with

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java	Sun May 11 23:37:21 2008
@@ -27,7 +27,6 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java	Sun May 11 23:37:21 2008
@@ -30,7 +30,6 @@
 import org.wso2.registry.users.def.DefaultRealmConfig;
 import org.wso2.registry.utils.AuthorizationUtil;
 
-
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java	Sun May 11 23:37:21 2008
@@ -22,20 +22,19 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.*;
-import org.wso2.registry.session.UserRegistry;
 import org.wso2.registry.config.DataBaseConfiguration;
-import org.wso2.registry.config.RegistryContext;
 import org.wso2.registry.config.HandlerConfiguration;
+import org.wso2.registry.config.RegistryContext;
 import org.wso2.registry.i18n.Messages;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
 import org.wso2.registry.jdbc.InMemoryEmbeddedRegistry;
 import org.wso2.registry.jdbc.utils.RegistryDataSource;
 import org.wso2.registry.servlet.utils.Utils;
+import org.wso2.registry.session.UserRegistry;
 import org.wso2.registry.users.AccessControlAdmin;
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.accesscontrol.AccessControlConstants;
 
-
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -45,10 +44,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLDecoder;
 import java.util.Iterator;
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java	Sun May 11 23:37:21 2008
@@ -17,21 +17,22 @@
 package org.wso2.registry.servlet;
 
 import org.apache.axiom.om.util.Base64;
-import org.wso2.registry.*;
-import org.wso2.registry.session.UserRegistry;
-import org.wso2.registry.jdbc.realm.RegistryRealm;
+import org.wso2.registry.Collection;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
 import org.wso2.registry.secure.AuthorizationFailedException;
-import org.wso2.registry.secure.SecureRegistry;
 import org.wso2.registry.servlet.utils.Utils;
+import org.wso2.registry.session.UserRegistry;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.InputStream;
+import java.io.PrintWriter;
 import java.util.Date;
 
 public class ResourceRequestProcessor {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/UserUtil.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/UserUtil.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/UserUtil.java	Sun May 11 23:37:21 2008
@@ -19,13 +19,10 @@
 import org.wso2.registry.ActionConstants;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.session.UserRegistry;
-import org.wso2.registry.secure.SecureRegistry;
-import org.wso2.registry.users.AccessControlAdmin;
 import org.wso2.registry.users.UserRealm;
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.accesscontrol.AccessControlConstants;
 
-
 import javax.servlet.http.HttpServletRequest;
 
 public class UserUtil {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/utils/Utils.java	Sun May 11 23:37:21 2008
@@ -19,13 +19,11 @@
 
 package org.wso2.registry.servlet.utils;
 
-import org.wso2.registry.Registry;
 import org.wso2.registry.RegistryConstants;
 import org.wso2.registry.RegistryException;
-import org.wso2.registry.session.UserRegistry;
-import org.wso2.registry.jdbc.realm.RegistryRealm;
 import org.wso2.registry.jdbc.EmbeddedRegistry;
 import org.wso2.registry.secure.SecureRegistry;
+import org.wso2.registry.session.UserRegistry;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/session/UserRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/session/UserRegistry.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/session/UserRegistry.java	Sun May 11 23:37:21 2008
@@ -16,23 +16,23 @@
 
 package org.wso2.registry.session;
 
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.accesscontrol.AuthorizingRealm;
-import org.wso2.registry.users.accesscontrol.AuthorizingRealmConfig;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.authenticator.Authenticator;
+import org.wso2.authenticator.AuthenticatorException;
 import org.wso2.registry.*;
 import org.wso2.registry.config.RegistryContext;
-import org.wso2.registry.jdbc.handlers.filters.Filter;
 import org.wso2.registry.jdbc.handlers.Handler;
+import org.wso2.registry.jdbc.handlers.filters.Filter;
 import org.wso2.registry.jdbc.realm.pathbased.PathBasedRegistryRealm;
-import org.wso2.authenticator.Authenticator;
-import org.wso2.authenticator.AuthenticatorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.users.UserRealm;
+import org.wso2.registry.users.UserStoreException;
+import org.wso2.registry.users.accesscontrol.AuthorizingRealm;
+import org.wso2.registry.users.accesscontrol.AuthorizingRealmConfig;
 
 import javax.sql.DataSource;
-import java.util.Map;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * Maintains information required for particular user. When registry functionality is invoked

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLAdminChecker.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLAdminChecker.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLAdminChecker.java	Sun May 11 23:37:21 2008
@@ -15,12 +15,12 @@
  */
 package org.wso2.registry.users.accesscontrol;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.wso2.registry.users.UserRealm;
 import org.wso2.registry.users.UserStoreException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * Checks whether a specific user is an admin. The list is Loaded once and read

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreAdmin.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreAdmin.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreAdmin.java	Sun May 11 23:37:21 2008
@@ -15,13 +15,13 @@
  */
 package org.wso2.registry.users.accesscontrol;
 
-import java.util.Map;
-
 import org.wso2.registry.i18n.Messages;
 import org.wso2.registry.users.Authorizer;
 import org.wso2.registry.users.UserStoreAdmin;
 import org.wso2.registry.users.UserStoreException;
 
+import java.util.Map;
+
 /**
  * Manipulates data in the User Store
  * 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreReader.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreReader.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/ACLUserStoreReader.java	Sun May 11 23:37:21 2008
@@ -15,13 +15,13 @@
  */
 package org.wso2.registry.users.accesscontrol;
 
-import java.util.Map;
-
 import org.wso2.registry.i18n.Messages;
 import org.wso2.registry.users.Authorizer;
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.UserStoreReader;
 
+import java.util.Map;
+
 /**
  * @see org.wso2.usermanager.UserStoreReader
  */

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/AuthorizingRealm.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/AuthorizingRealm.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/accesscontrol/AuthorizingRealm.java	Sun May 11 23:37:21 2008
@@ -15,14 +15,8 @@
  */
 package org.wso2.registry.users.accesscontrol;
 
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.AccessControlAdmin;
 import org.wso2.authenticator.Authenticator;
-import org.wso2.registry.users.Authorizer;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.UserStoreAdmin;
-import org.wso2.registry.users.UserStoreReader;
+import org.wso2.registry.users.*;
 
 /**
  * ACL aware Realm. Contains an authorized user and a realm. Always checks

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAccessControlAdmin.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAccessControlAdmin.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAccessControlAdmin.java	Sun May 11 23:37:21 2008
@@ -15,13 +15,6 @@
  */
 package org.wso2.registry.users.def;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.i18n.Messages;
@@ -29,6 +22,12 @@
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.def.util.DefaultDatabaseUtil;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 /**
  * @see org.wso2.usermanager.AccessControlAdmin
  */

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthenticator.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthenticator.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthenticator.java	Sun May 11 23:37:21 2008
@@ -15,23 +15,21 @@
  */
 package org.wso2.registry.users.def;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
 import org.apache.axiom.om.util.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.authenticator.Authenticator;
 import org.wso2.authenticator.AuthenticatorException;
-
 import org.wso2.registry.i18n.Messages;
 
+import javax.sql.DataSource;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 /**
  * @see org.wso2.usermanager.Authenticator
  */

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthorizer.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthorizer.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultAuthorizer.java	Sun May 11 23:37:21 2008
@@ -15,15 +15,6 @@
  */
 package org.wso2.registry.users.def;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.sql.DataSource;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.i18n.Messages;
@@ -31,6 +22,14 @@
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.def.util.DefaultDatabaseUtil;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * @see org.wso2.usermanager.Authorizer
  */

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultRealm.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultRealm.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultRealm.java	Sun May 11 23:37:21 2008
@@ -16,20 +16,14 @@
 
 package org.wso2.registry.users.def;
 
-import java.sql.Driver;
-
-import javax.sql.DataSource;
-
 import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.authenticator.Authenticator;
-import org.wso2.registry.users.AccessControlAdmin;
-import org.wso2.registry.users.Authorizer;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreAdmin;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.UserStoreReader;
+import org.wso2.registry.users.*;
+
+import javax.sql.DataSource;
+import java.sql.Driver;
 
 /**
  * DefaultRealm is used by developers when the need to maintain

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreAdmin.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreAdmin.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreAdmin.java	Sun May 11 23:37:21 2008
@@ -15,6 +15,15 @@
  */
 package org.wso2.registry.users.def;
 
+import org.apache.axiom.om.util.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.i18n.Messages;
+import org.wso2.registry.users.UserStoreAdmin;
+import org.wso2.registry.users.UserStoreException;
+import org.wso2.registry.users.def.util.DefaultDatabaseUtil;
+
+import javax.sql.DataSource;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.sql.Connection;
@@ -25,16 +34,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.sql.DataSource;
-
-import org.apache.axiom.om.util.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.i18n.Messages;
-import org.wso2.registry.users.UserStoreAdmin;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.def.util.DefaultDatabaseUtil;
-
 /**
  * Manipulates data in the User Store
  * 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreReader.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreReader.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/DefaultUserStoreReader.java	Sun May 11 23:37:21 2008
@@ -15,18 +15,6 @@
  */
 package org.wso2.registry.users.def;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.i18n.Messages;
@@ -34,6 +22,13 @@
 import org.wso2.registry.users.UserStoreReader;
 import org.wso2.registry.users.def.util.DefaultDatabaseUtil;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
 /**
  * Manipulates data in the User Store
  * 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDataSupplierImpl.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDataSupplierImpl.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDataSupplierImpl.java	Sun May 11 23:37:21 2008
@@ -15,6 +15,12 @@
  */
 package org.wso2.registry.users.def.util;
 
+import org.wso2.registry.i18n.Messages;
+import org.wso2.registry.users.UserStoreException;
+import org.wso2.registry.users.def.DefaultDataSupplier;
+import org.wso2.registry.users.def.DefaultRealmConstants;
+
+import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -22,13 +28,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.sql.DataSource;
-
-import org.wso2.registry.i18n.Messages;
-import org.wso2.registry.users.UserStoreException;
-import org.wso2.registry.users.def.DefaultRealmConstants;
-import org.wso2.registry.users.def.DefaultDataSupplier;
-
 
 /**
  * Represents the user store. If you change this object it will change the way

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDatabaseUtil.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDatabaseUtil.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/def/util/DefaultDatabaseUtil.java	Sun May 11 23:37:21 2008
@@ -15,17 +15,13 @@
  */
 package org.wso2.registry.users.def.util;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.LinkedList;
-import java.util.List;
-
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.def.DefaultRealmConstants;
 
+import java.sql.*;
+import java.util.LinkedList;
+import java.util.List;
+
 public class DefaultDatabaseUtil {
     // TODO Start -delete
     public static String userTable = "CREATE TABLE UM_USERS ("

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/users/verifier/EmailVerifier.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/users/verifier/EmailVerifier.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/users/verifier/EmailVerifier.java	Sun May 11 23:37:21 2008
@@ -1,28 +1,6 @@
 package org.wso2.registry.users.verifier;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.Driver;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Map.Entry;
-
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
+import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.i18n.Messages;
@@ -31,7 +9,13 @@
 import org.wso2.registry.users.UserStoreException;
 import org.wso2.registry.users.def.DefaultRealm;
 
-import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
+import javax.mail.*;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.sql.*;
+import java.util.*;
+import java.util.Map.Entry;
 
 public class EmailVerifier {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtil.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtil.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtil.java	Sun May 11 23:37:21 2008
@@ -22,7 +22,7 @@
 import org.wso2.registry.RegistryConstants;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.users.*;
-import org.wso2.registry.users.accesscontrol.*;
+import org.wso2.registry.users.accesscontrol.AccessControlConstants;
 
 // todo: remove this class, once refactoring is done
 public class AuthorizationUtil {

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtils.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtils.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/AuthorizationUtils.java	Sun May 11 23:37:21 2008
@@ -16,15 +16,14 @@
 
 package org.wso2.registry.utils;
 
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.RegistryConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.registry.ActionConstants;
-import org.wso2.registry.session.SessionRealm;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
 import org.wso2.registry.session.CurrentSession;
 import org.wso2.registry.users.*;
 import org.wso2.registry.users.accesscontrol.AccessControlConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 public class AuthorizationUtils {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/RegistryUtils.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/RegistryUtils.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/RegistryUtils.java	Sun May 11 23:37:21 2008
@@ -16,14 +16,9 @@
 
 package org.wso2.registry.utils;
 
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.session.SessionRealm;
-import org.wso2.registry.session.CurrentSession;
-import org.wso2.registry.users.UserRealm;
-import org.wso2.registry.users.UserStoreException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryConstants;
 
 public class RegistryUtils {
 

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/SchemaValidator.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/SchemaValidator.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/utils/SchemaValidator.java	Sun May 11 23:37:21 2008
@@ -15,11 +15,11 @@
  */
 package org.wso2.registry.utils;
 
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.Resource;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;