Author: chathura
Date: Wed Jan 16 19:12:55 2008
New Revision: 12364
Log:
Added realm as a parameter to the URL handler and SQL processor constructors,
so that they can handle the permissions.
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/queries/QueryProcessor.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessorManager.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
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 Jan 16 19:12:55 2008
@@ -115,9 +115,9 @@
defaultRealm = realm;
- urlHandlerManager = new URLHandlerManager(dataSource);
+ urlHandlerManager = new URLHandlerManager(dataSource, realm);
mediaTypeManager = new MediaTypeManager(dataSource, realm);
- queryProcessorManager = new QueryProcessorManager(dataSource);
+ queryProcessorManager = new QueryProcessorManager(dataSource, realm);
resourceDAO = new VersionedResourceDAO();
tagsDAO = new TagsDAO();
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 Jan 16 19:12:55 2008
@@ -18,6 +18,7 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -26,9 +27,11 @@
public abstract class QueryProcessor {
protected DataSource dataSource;
+ protected Realm realm;
- public QueryProcessor(DataSource dataSource) {
+ public QueryProcessor(DataSource dataSource, Realm realm) {
this.dataSource = dataSource;
+ this.realm = realm;
}
public abstract Resource executeQuery(Resource query, Map parameters)
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessorManager.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessorManager.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/queries/QueryProcessorManager.java
Wed Jan 16 19:12:55 2008
@@ -19,6 +19,7 @@
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.Resource;
import org.wso2.registry.RegistryException;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.util.HashMap;
@@ -29,12 +30,12 @@
private DataSource dataSource;
private Map queryProcessors = new HashMap();
- public QueryProcessorManager(DataSource dataSource) {
+ public QueryProcessorManager(DataSource dataSource, Realm realm) {
this.dataSource = dataSource;
queryProcessors.
- put(RegistryConstants.SQL_QUERY_MEDIA_TYPE, new
SQLQueryProcessor(dataSource));
+ put(RegistryConstants.SQL_QUERY_MEDIA_TYPE, new
SQLQueryProcessor(dataSource, realm));
}
public QueryProcessor getQueryProcessor(String queryType) {
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 Jan 16 19:12:55 2008
@@ -26,6 +26,7 @@
import org.wso2.registry.jdbc.dao.TagsDAO;
import org.wso2.registry.jdbc.dataobjects.RatingDO;
import org.wso2.registry.jdbc.dataobjects.TaggingDO;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -41,8 +42,8 @@
private static final Log log = LogFactory.getLog(SQLQueryProcessor.class);
- public SQLQueryProcessor(DataSource dataSource) {
- super(dataSource);
+ public SQLQueryProcessor(DataSource dataSource, Realm realm) {
+ super(dataSource, realm);
}
public Resource executeQuery(Resource query, Map parameters)
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 Jan 16 19:12:55 2008
@@ -21,6 +21,7 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.dao.CommentsDAO;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -33,8 +34,8 @@
private static final Log log =
LogFactory.getLog(CommentCollectionURLHandler.class);
- public CommentCollectionURLHandler(DataSource dataSource) {
- super(dataSource);
+ public CommentCollectionURLHandler(DataSource dataSource, Realm realm) {
+ super(dataSource, realm);
}
public Resource handleURL(String url) throws RegistryException {
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 Jan 16 19:12:55 2008
@@ -23,6 +23,7 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.dao.CommentsDAO;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -34,8 +35,8 @@
private CommentsDAO commentsDAO = new CommentsDAO();
- public CommentURLHandler(DataSource dataSource) {
- super(dataSource);
+ public CommentURLHandler(DataSource dataSource, Realm realm) {
+ super(dataSource, realm);
}
/**
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 Jan 16 19:12:55 2008
@@ -22,6 +22,7 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.dao.RatingsDAO;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -32,8 +33,8 @@
private static final Log log = LogFactory.getLog(RatingURLHandler.class);
- public RatingURLHandler(DataSource dataSource) {
- super(dataSource);
+ public RatingURLHandler(DataSource dataSource, Realm realm) {
+ super(dataSource, realm);
}
public Resource handleURL(String url) throws RegistryException {
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 Jan 16 19:12:55 2008
@@ -21,6 +21,7 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.dao.RatingsDAO;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -32,8 +33,8 @@
private static final Log log =
LogFactory.getLog(CommentCollectionURLHandler.class);
- public RatingsCollectionURLHandler(DataSource dataSource) {
- super(dataSource);
+ public RatingsCollectionURLHandler(DataSource dataSource, Realm realm) {
+ super(dataSource, realm);
}
public Resource handleURL(String url) throws RegistryException {
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 Jan 16 19:12:55 2008
@@ -21,6 +21,7 @@
import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.dao.TagsDAO;
import org.wso2.registry.jdbc.dataobjects.TaggingDO;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -28,8 +29,8 @@
public class TagURLHandler extends URLHandler {
- public TagURLHandler(DataSource dataSource) {
- super(dataSource);
+ public TagURLHandler(DataSource dataSource, Realm realm) {
+ super(dataSource, realm);
}
/**
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 Jan 16 19:12:55 2008
@@ -18,6 +18,7 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
@@ -36,9 +37,11 @@
public abstract class URLHandler {
protected DataSource dataSource;
+ protected Realm realm;
- public URLHandler(DataSource dataSource) {
+ public URLHandler(DataSource dataSource, Realm realm) {
this.dataSource = dataSource;
+ this.realm = realm;
}
/**
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 Jan 16 19:12:55 2008
@@ -20,6 +20,7 @@
import org.wso2.registry.Resource;
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.config.RegistryContext;
+import org.wso2.usermanager.Realm;
import javax.sql.DataSource;
import java.util.ArrayList;
@@ -31,13 +32,13 @@
private List urlHandlers = new ArrayList();
- public URLHandlerManager(DataSource dataSource) throws RegistryException {
+ public URLHandlerManager(DataSource dataSource, Realm realm) throws
RegistryException {
- urlHandlers.add(new CommentURLHandler(dataSource));
- urlHandlers.add(new CommentCollectionURLHandler(dataSource));
- urlHandlers.add(new RatingURLHandler(dataSource));
- urlHandlers.add(new RatingsCollectionURLHandler(dataSource));
- urlHandlers.add(new TagURLHandler(dataSource));
+ urlHandlers.add(new CommentURLHandler(dataSource, realm));
+ urlHandlers.add(new CommentCollectionURLHandler(dataSource, realm));
+ urlHandlers.add(new RatingURLHandler(dataSource, realm));
+ urlHandlers.add(new RatingsCollectionURLHandler(dataSource, realm));
+ urlHandlers.add(new TagURLHandler(dataSource, realm));
RegistryContext registryContext = (RegistryContext) System.
getProperties().get(RegistryConstants.REGISTRY_CONTEXT);
@@ -52,9 +53,9 @@
try {
Class urlHandlerClass = Class.forName(urlHandlerClassName);
Constructor constructor =
- urlHandlerClass.getConstructor(new Class[]
{DataSource.class});
+ urlHandlerClass.getConstructor(new Class[]
{DataSource.class, Realm.class});
URLHandler urlHandler =
- (URLHandler) constructor.newInstance(new Object[]
{dataSource});
+ (URLHandler) constructor.newInstance(new Object[]
{dataSource, realm});
urlHandlers.add(urlHandler);
} catch (ClassNotFoundException e) {
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
