Author: chathura
Date: Wed Dec 12 23:26:19 2007
New Revision: 11059
Log:
Another phase of refactoring and clean up.
Added:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java
- copied, changed from r11058,
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryRealmFactory.java
Removed:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceDAO.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryRealmFactory.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/actions/
trunk/registry/modules/core/src/main/java/org/wso2/registry/versions/
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProviderManager.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/client/RegistryClient.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/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/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/mediatypes/MediaTypeHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SQLQueryMediaTypeHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.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/queries/SQLQueryProcessor.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentCollectionURLHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingURLHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandlerManager.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/ConsoleURLMapper.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/RegistryServlet.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/Utils.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/TagsTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProviderManager.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProviderManager.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAtomProviderManager.java
Wed Dec 12 23:26:19 2007
@@ -18,8 +18,8 @@
*/
package org.wso2.registry.app;
-import org.apache.abdera.protocol.server.impl.AbstractSingletonProviderManager;
import org.apache.abdera.protocol.server.Provider;
+import org.apache.abdera.protocol.server.impl.AbstractSingletonProviderManager;
public class RegistryAtomProviderManager extends
AbstractSingletonProviderManager {
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
Wed Dec 12 23:26:19 2007
@@ -23,16 +23,14 @@
import org.apache.abdera.protocol.Response;
import org.apache.abdera.protocol.client.AbderaClient;
import org.apache.abdera.protocol.client.ClientResponse;
-import org.apache.abdera.writer.Writer;
import org.apache.axiom.om.util.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.*;
import org.wso2.registry.Comment;
+import org.wso2.registry.*;
import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/client/RegistryClient.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/client/RegistryClient.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/client/RegistryClient.java
Wed Dec 12 23:26:19 2007
@@ -16,17 +16,17 @@
package org.wso2.registry.client;
-import org.wso2.registry.*;
+import org.apache.abdera.model.Document;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.abdera.model.Document;
-import org.apache.abdera.protocol.client.ClientResponse;
import org.apache.abdera.protocol.client.AbderaClient;
+import org.apache.abdera.protocol.client.ClientResponse;
+import org.wso2.registry.*;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Date;
import java.util.List;
-import java.io.InputStream;
-import java.io.IOException;
public class RegistryClient implements Registry {
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
Wed Dec 12 23:26:19 2007
@@ -22,21 +22,21 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.registry.*;
-import org.wso2.registry.utils.AuthorizationUtil;
import org.wso2.registry.i18n.Messages;
import org.wso2.registry.jdbc.dao.*;
import org.wso2.registry.jdbc.mediatypes.MediaTypeManager;
import org.wso2.registry.jdbc.queries.QueryProcessor;
import org.wso2.registry.jdbc.queries.QueryProcessorFactory;
import org.wso2.registry.jdbc.urlhandlers.URLHandlerManager;
+import org.wso2.registry.utils.AuthorizationUtil;
import org.wso2.usermanager.Realm;
import org.wso2.usermanager.UserManagerException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.List;
import java.util.Date;
+import java.util.List;
/**
* 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/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
Wed Dec 12 23:26:19 2007
@@ -20,12 +20,11 @@
package org.wso2.registry.jdbc.dao;
import org.wso2.registry.Comment;
-import org.wso2.registry.LogEntry;
import org.wso2.registry.jdbc.DatabaseConstants;
import java.sql.*;
-import java.sql.Date;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class CommentsDAO {
@@ -118,73 +117,6 @@
return commentIDs;
}
- public List getLogs(String resourcePath, String userName,
- java.util.Date from, java.util.Date to, Connection
conn)
- throws SQLException {
-
- ResourceDAO resourceDAO = new ResourceDAO();
-
- long aid = resourceDAO.getArtifactID(resourcePath, conn);
-
- String sql = "SELECT A.PATH, C.USER_ID, C.COMMENTED_TIME,
C.COMMENT_TEXT FROM ARTIFACTS A, COMMENTS C WHERE A.AID=C.AID";
-
- if (aid != -1) {
- sql = sql + " AND C.AID=?";
- }
-
- if (userName != null) {
- sql = sql + " AND C.USER_ID=?";
- }
-
- if (from != null) {
- sql = sql + " AND C.COMMENTED_TIME>?";
- }
-
- if (to != null) {
- sql = sql + " AND C.COMMENTED_TIME<?";
- }
-
- PreparedStatement s = conn.prepareStatement(sql);
-
- int paramNumber = 1;
-
- if (aid != -1) {
- s.setLong(paramNumber, aid);
- paramNumber++;
- }
-
- if (userName != null) {
- s.setString(paramNumber, userName);
- paramNumber++;
- }
-
- if (from != null) {
- s.setTimestamp(paramNumber, new Timestamp(from.getTime()));
- paramNumber++;
- }
-
- if (to != null) {
- s.setTimestamp(paramNumber, new Timestamp(to.getTime()));
-// paramNumber++;
- }
-
- ResultSet results = s.executeQuery();
-
- List resultList = new ArrayList();
- while (results.next()) {
- LogEntry logEntry = new LogEntry();
-
logEntry.setResourcePath(results.getString(DatabaseConstants.PATH_FIELD));
-
logEntry.setUserName(results.getString(DatabaseConstants.USER_ID_FIELD));
- logEntry.setDate(new
Date(results.getTimestamp(DatabaseConstants.COMMENTED_TIME_FIELD).getTime()));
- logEntry.setAction(LogEntry.COMMENT);
-
logEntry.setActionData(results.getString(DatabaseConstants.COMMENT_TEXT_FIELD));
-
- resultList.add(logEntry);
- }
-
- return resultList;
- }
-
public String getResourcePathOfComment(long commentID, Connection conn)
throws SQLException {
String sql = "SELECT A.PATH FROM ARTIFACTS A, COMMENTS C WHERE
A.AID=C.AID AND C.CM_ID=?";
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
Wed Dec 12 23:26:19 2007
@@ -20,9 +20,9 @@
import org.wso2.registry.jdbc.DatabaseConstants;
import java.sql.*;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.ArrayList;
public class LogsDAO {
@@ -45,11 +45,11 @@
public List getLogs(String resourcePath, int action,
String userName, Date from, Date to, Connection conn)
throws SQLException {
- ResourceDAO resourceDAO = new ResourceDAO();
+ VersionedResourceDAO resourceDAO = new VersionedResourceDAO();
long aid = -1;
if (resourcePath != null) {
- aid = resourceDAO.getArtifactID(resourcePath, conn);
+ aid = resourceDAO.getResourceID(resourcePath, conn);
}
String sql = "SELECT A.PATH, L.USER_ID, L.LOGGED_TIME, L.ACTION,
L.ACTION_DATA FROM " +
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
Wed Dec 12 23:26:19 2007
@@ -21,11 +21,10 @@
import org.wso2.registry.jdbc.DatabaseConstants;
import org.wso2.registry.jdbc.dataobjects.RatingDO;
-import org.wso2.registry.LogEntry;
import java.sql.*;
-import java.sql.Date;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class RatingsDAO {
@@ -207,73 +206,4 @@
return null;
}
-
- public List getLogs(String resourcePath, String userName,
- java.util.Date from, java.util.Date to, Connection
conn)
- throws SQLException {
-
- ResourceDAO resourceDAO = new ResourceDAO();
-
- long aid;
- aid = resourceDAO.getArtifactID(resourcePath, conn);
-
- String sql = "SELECT A.PATH, R.USER_ID, R.RATED_TIME, R.RATING FROM
ARTIFACTS A, RATINGS R WHERE A.AID=R.AID";
-
- if (aid != -1) {
- sql = sql + " AND R.AID=?";
- }
-
- if (userName != null) {
- sql = sql + " AND R.USER_ID=?";
- }
-
- if (from != null) {
- sql = sql + " AND R.RATED_TIME>?";
- }
-
- if (to != null) {
- sql = sql + " AND R.RATED_TIME<?";
- }
-
- PreparedStatement s = conn.prepareStatement(sql);
-
- int paramNumber = 1;
-
- if (aid != -1) {
- s.setLong(paramNumber, aid);
- paramNumber++;
- }
-
- if (userName != null) {
- s.setString(paramNumber, userName);
- paramNumber++;
- }
-
- if (from != null) {
- s.setTimestamp(paramNumber, new Timestamp(from.getTime()));
- paramNumber++;
- }
-
- if (to != null) {
- s.setTimestamp(paramNumber, new Timestamp(to.getTime()));
-// paramNumber++;
- }
-
- ResultSet results = s.executeQuery();
-
- List resultList = new ArrayList();
- while (results.next()) {
- LogEntry logEntry = new LogEntry();
-
logEntry.setResourcePath(results.getString(DatabaseConstants.PATH_FIELD));
-
logEntry.setUserName(results.getString(DatabaseConstants.USER_ID_FIELD));
- logEntry.setDate(new
Date(results.getTimestamp(DatabaseConstants.RATED_TIME_FIELD).getTime()));
- logEntry.setAction(LogEntry.RATING);
- int rating = results.getInt(DatabaseConstants.RATING_FIELD);
- logEntry.setActionData(Integer.toString(rating));
-
- resultList.add(logEntry);
- }
-
- return resultList;
- }
}
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
Wed Dec 12 23:26:19 2007
@@ -25,8 +25,8 @@
import org.wso2.registry.jdbc.dataobjects.TaggingDO;
import java.sql.*;
-import java.sql.Date;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class TagsDAO {
@@ -77,8 +77,8 @@
public void removeTag(String path, String tag, Connection conn)
throws SQLException {
- ResourceDAO resourceDAO = new ResourceDAO();
- long resourceID = resourceDAO.getArtifactID(path, conn);
+ VersionedResourceDAO resourceDAO = new VersionedResourceDAO();
+ long resourceID = resourceDAO.getResourceID(path, conn);
String sql = "DELETE FROM TAGS WHERE AID=? AND TAG_NAME=?";
@@ -92,8 +92,8 @@
public void removeTag(String path, String tag, String userName, Connection
conn)
throws SQLException {
- ResourceDAO resourceDAO = new ResourceDAO();
- long resourceID = resourceDAO.getArtifactID(path, conn);
+ VersionedResourceDAO resourceDAO = new VersionedResourceDAO();
+ long resourceID = resourceDAO.getResourceID(path, conn);
String sql = "DELETE FROM TAGS WHERE AID=? AND TAG_NAME=?";
if (!userName.equals("*")) {
@@ -183,8 +183,8 @@
public TaggingDO getTagging(String path, String tagName, String userName,
Connection conn)
throws SQLException {
- ResourceDAO resourceDAO = new ResourceDAO();
- long aid = resourceDAO.getArtifactID(path, conn);
+ VersionedResourceDAO resourceDAO = new VersionedResourceDAO();
+ long aid = resourceDAO.getResourceID(path, conn);
String sql = "SELECT T.TAGGED_TIME FROM TAGS T, ARTIFACTS A WHERE
A.AID=T.AID AND T.AID=? AND T.USER_ID=? AND T.TAG_NAME=?";
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
Wed Dec 12 23:26:19 2007
@@ -16,13 +16,11 @@
package org.wso2.registry.jdbc.dao;
-import org.wso2.registry.Resource;
-import org.wso2.registry.LogEntry;
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.jdbc.DatabaseConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.DatabaseConstants;
import java.sql.*;
import java.util.ArrayList;
@@ -1011,91 +1009,4 @@
return parentPath;
}
-
- /**
- * To get the log messages for all the artifacts
- *
- * @param resourcePath : Path of the resource
- * @param userName : user name
- * @param from : from which date
- * @param to : to date
- * @param conn : db connection
- * @return List of LogEntry lits
- * @throws RegistryException : if something went wrong
- * @param conn : Connection to the DB
- */
- public List getLogs(String resourcePath,
- String userName,
- java.util.Date from,
- java.util.Date to,
- Connection conn) throws Exception {
- String SQL = "SELECT UPDATED_TIME , AUTHOR , AID FROM VERSIONS ";
- long aid = 0;
- if (resourcePath != null) {
- ResourceDAO resourceDAO = new ResourceDAO();
- aid = resourceDAO.getArtifactID(resourcePath, conn);
- }
- boolean where = false;
- String whereStatment = "";
- if (aid != 0) {
- whereStatment = "WHERE AID=?";
- where = true;
- }
-
- if (userName != null) {
- if (where) {
- whereStatment = whereStatment + " AND AUTHOR=?";
- } else {
- whereStatment = "WHERE AUTHOR= ?";
- where = true;
- }
- }
- if (from != null) {
- if (where) {
- whereStatment = whereStatment + " AND UPDATED_TIME > ?";
- } else {
- whereStatment = " WHERE UPDATED_TIME > ?";
- where = true;
- }
- }
- if (to != null) {
- if (where) {
- whereStatment = whereStatment + " AND UPDATED_TIME < ?";
- } else {
- whereStatment = " WHERE UPDATED_TIME < ?";
- }
- }
- SQL = SQL + whereStatment;
-
- PreparedStatement ps = conn.prepareStatement(SQL);
- int count = 1;
- if (aid != 0) {
- ps.setLong(count, aid);
- count++;
- }
- if (userName != null) {
- ps.setString(count, userName);
- count++;
- }
- if (from != null) {
- ps.setTimestamp(count, new Timestamp(from.getTime()));
- count++;
- }
- if (to != null) {
- ps.setTimestamp(count, new Timestamp(to.getTime()));
- }
- ResultSet result = ps.executeQuery();
- ArrayList logevents = new ArrayList();
-
- while (result.next()) {
- LogEntry logEntry = new LogEntry();
- logEntry.setAction(LogEntry.UPDATE);
- logEntry.setDate(result.getTime("UPDATED_TIME"));
- logEntry.setUserName(result.getString("AUTHOR"));
- aid = result.getLong("AID");
- logEntry.setResourcePath(getResourcePath(aid, conn));
- logevents.add(logEntry);
- }
- return logevents;
- }
}
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeHandler.java
Wed Dec 12 23:26:19 2007
@@ -16,8 +16,8 @@
package org.wso2.registry.jdbc.mediatypes;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.dao.VersionedResourceDAO;
import org.wso2.registry.utils.AuthorizationUtil;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/MediaTypeManager.java
Wed Dec 12 23:26:19 2007
@@ -18,9 +18,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.i18n.Messages;
import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.JDBCRegistry;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/Axis2RepositoryMediaTypeHandler.java
Wed Dec 12 23:26:19 2007
@@ -16,12 +16,12 @@
package org.wso2.registry.jdbc.mediatypes.builtin;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
+import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.mediatypes.MediaTypeHandler;
import org.wso2.registry.jdbc.mediatypes.MediaTypeManager;
-import org.wso2.registry.jdbc.ConnectionFactory;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.RegistryConstants;
import org.wso2.usermanager.Realm;
public class Axis2RepositoryMediaTypeHandler extends MediaTypeHandler {
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
Wed Dec 12 23:26:19 2007
@@ -18,9 +18,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.User;
import org.wso2.registry.i18n.Messages;
import org.wso2.registry.jdbc.ConnectionFactory;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SQLQueryMediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SQLQueryMediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SQLQueryMediaTypeHandler.java
Wed Dec 12 23:26:19 2007
@@ -16,8 +16,8 @@
package org.wso2.registry.jdbc.mediatypes.builtin;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.mediatypes.MediaTypeHandler;
import org.wso2.registry.jdbc.mediatypes.MediaTypeManager;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/SynapseRepositoryMediaTypeHandler.java
Wed Dec 12 23:26:19 2007
@@ -16,9 +16,9 @@
package org.wso2.registry.jdbc.mediatypes.builtin;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.mediatypes.MediaTypeHandler;
import org.wso2.registry.jdbc.mediatypes.MediaTypeManager;
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
Wed Dec 12 23:26:19 2007
@@ -16,8 +16,8 @@
package org.wso2.registry.jdbc.queries;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import java.sql.Connection;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/SQLQueryProcessor.java
Wed Dec 12 23:26:19 2007
@@ -18,14 +18,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.DatabaseConstants;
-import org.wso2.registry.jdbc.dataobjects.RatingDO;
-import org.wso2.registry.jdbc.dataobjects.TaggingDO;
import org.wso2.registry.jdbc.dao.RatingsDAO;
import org.wso2.registry.jdbc.dao.TagsDAO;
+import org.wso2.registry.jdbc.dataobjects.RatingDO;
+import org.wso2.registry.jdbc.dataobjects.TaggingDO;
import java.sql.Connection;
import java.sql.PreparedStatement;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentCollectionURLHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentCollectionURLHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentCollectionURLHandler.java
Wed Dec 12 23:26:19 2007
@@ -18,8 +18,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.dao.CommentsDAO;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/CommentURLHandler.java
Wed Dec 12 23:26:19 2007
@@ -18,10 +18,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Resource;
import org.wso2.registry.Comment;
-import org.wso2.registry.RegistryException;
import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.dao.CommentsDAO;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingURLHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingURLHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingURLHandler.java
Wed Dec 12 23:26:19 2007
@@ -18,11 +18,11 @@
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.jdbc.ConnectionFactory;
import org.wso2.registry.jdbc.dao.RatingsDAO;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.RegistryConstants;
import java.sql.Connection;
import java.sql.SQLException;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/RatingsCollectionURLHandler.java
Wed Dec 12 23:26:19 2007
@@ -18,16 +18,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
-import org.wso2.registry.jdbc.dao.TagsDAO;
import org.wso2.registry.jdbc.dao.RatingsDAO;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class RatingsCollectionURLHandler extends URLHandler {
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/TagURLHandler.java
Wed Dec 12 23:26:19 2007
@@ -16,12 +16,12 @@
package org.wso2.registry.jdbc.urlhandlers;
-import org.wso2.registry.Resource;
-import org.wso2.registry.RegistryException;
import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
-import org.wso2.registry.jdbc.dataobjects.TaggingDO;
import org.wso2.registry.jdbc.dao.TagsDAO;
+import org.wso2.registry.jdbc.dataobjects.TaggingDO;
import java.sql.Connection;
import java.sql.SQLException;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandler.java
Wed Dec 12 23:26:19 2007
@@ -16,8 +16,8 @@
package org.wso2.registry.jdbc.urlhandlers;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
/**
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandlerManager.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandlerManager.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/urlhandlers/URLHandlerManager.java
Wed Dec 12 23:26:19 2007
@@ -16,8 +16,8 @@
package org.wso2.registry.jdbc.urlhandlers;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.ConnectionFactory;
import java.util.ArrayList;
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
Wed Dec 12 23:26:19 2007
@@ -20,6 +20,7 @@
import org.apache.commons.logging.LogFactory;
import org.wso2.registry.RegistryException;
import org.wso2.registry.jdbc.DatabaseConstants;
+import org.wso2.registry.servlet.RegistryRealmFactory;
import org.wso2.usermanager.UserManagerException;
import org.wso2.usermanager.readwrite.DefaultDatabaseUtil;
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
Wed Dec 12 23:26:19 2007
@@ -21,7 +21,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.*;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
import org.wso2.usermanager.*;
import java.util.Map;
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
Wed Dec 12 23:26:19 2007
@@ -22,10 +22,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.registry.*;
-import org.wso2.usermanager.Realm;
-import org.wso2.usermanager.UserManagerException;
import org.wso2.usermanager.Authenticator;
import org.wso2.usermanager.Authorizer;
+import org.wso2.usermanager.Realm;
+import org.wso2.usermanager.UserManagerException;
import org.wso2.usermanager.acl.realm.AuthorizingRealm;
import org.wso2.usermanager.acl.realm.AuthorizingRealmConfig;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ConsoleURLMapper.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ConsoleURLMapper.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ConsoleURLMapper.java
Wed Dec 12 23:26:19 2007
@@ -18,9 +18,9 @@
import org.wso2.registry.RegistryConstants;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
import java.io.IOException;
public class ConsoleURLMapper {
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
Wed Dec 12 23:26:19 2007
@@ -22,8 +22,8 @@
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.servlet.ServletRequestContext;
-import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.Resource;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
Copied:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java
(from r11058,
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryRealmFactory.java)
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/RegistryRealmFactory.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryRealmFactory.java
Wed Dec 12 23:26:19 2007
@@ -17,23 +17,25 @@
* under the License.
*/
-package org.wso2.registry.secure;
+package org.wso2.registry.servlet;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.wso2.registry.RegistryException;
-import org.wso2.registry.utils.AuthorizationUtil;
import org.wso2.registry.i18n.Messages;
import org.wso2.registry.jdbc.DatabaseConstants;
-import org.wso2.usermanager.*;
+import org.wso2.registry.secure.HSQLDBInitializer;
+import org.wso2.registry.secure.RegistryUMConstants;
+import org.wso2.registry.utils.AuthorizationUtil;
+import org.wso2.usermanager.Realm;
import org.wso2.usermanager.readwrite.DefaultRealm;
import org.wso2.usermanager.readwrite.DefaultRealmConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import javax.sql.DataSource;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletConfig;
+import javax.sql.DataSource;
public class RegistryRealmFactory {
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
Wed Dec 12 23:26:19 2007
@@ -21,13 +21,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wso2.registry.Resource;
import org.wso2.registry.Registry;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.RegistryException;
+import org.wso2.registry.Resource;
import org.wso2.registry.i18n.Messages;
import org.wso2.registry.jdbc.JDBCRegistry;
-import org.wso2.registry.secure.RegistryRealmFactory;
import org.wso2.usermanager.Realm;
import javax.servlet.ServletConfig;
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/Utils.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/Utils.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/Utils.java
Wed Dec 12 23:26:19 2007
@@ -19,7 +19,9 @@
package org.wso2.registry.servlet;
-import org.wso2.registry.*;
+import org.wso2.registry.Registry;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.RegistryException;
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.usermanager.Realm;
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
Wed Dec 12 23:26:19 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.wso2.registry.*;
-import org.wso2.registry.secure.RegistryRealmFactory;
+import org.wso2.registry.servlet.RegistryRealmFactory;
import org.wso2.usermanager.Realm;
import java.util.*;
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/TagsTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/TagsTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/TagsTest.java
Wed Dec 12 23:26:19 2007
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
import org.wso2.registry.*;
-import org.wso2.registry.secure.RegistryRealmFactory;
+import org.wso2.registry.servlet.RegistryRealmFactory;
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.registry.secure.RegistryUserManager;
import org.wso2.usermanager.Realm;
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java
Wed Dec 12 23:26:19 2007
@@ -23,7 +23,7 @@
import org.wso2.registry.Registry;
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
-import org.wso2.registry.secure.RegistryRealmFactory;
+import org.wso2.registry.servlet.RegistryRealmFactory;
import org.wso2.usermanager.Realm;
public class VersionHandlingTest extends TestCase {
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/secure/SecureRegistryTest.java
Wed Dec 12 23:26:19 2007
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import org.wso2.registry.*;
+import org.wso2.registry.servlet.RegistryRealmFactory;
import org.wso2.registry.jdbc.JDBCRegistry;
import org.wso2.usermanager.Realm;
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
