You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by ks...@apache.org on 2002/07/14 11:35:54 UTC
cvs commit: xml-xindice/java/src/org/apache/xindice/core/security AccessDeniedException.java Credentials.java DBSecurityManager.java InvalidCredentialsException.java InvalidPasswordException.java LocalSecurityManager.java PasswordCredentials.java Permission.java ResourcePermissions.java SecurityException.java UnknownUserException.java package.html
kstaken 2002/07/14 02:35:53
Modified: java/src/org/apache/xindice/core Collection.java
Database.java
Removed: java/src/org/apache/xindice/core/security
AccessDeniedException.java Credentials.java
DBSecurityManager.java
InvalidCredentialsException.java
InvalidPasswordException.java
LocalSecurityManager.java PasswordCredentials.java
Permission.java ResourcePermissions.java
SecurityException.java UnknownUserException.java
package.html
Log:
Removing the old security code that was never finished.
Revision Changes Path
1.2 +2 -5 xml-xindice/java/src/org/apache/xindice/core/Collection.java
Index: Collection.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/Collection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Collection.java 6 Dec 2001 21:00:11 -0000 1.1
+++ Collection.java 14 Jul 2002 09:35:53 -0000 1.2
@@ -698,10 +698,7 @@
* @param docKey The Document Key
* @return The Document
*/
- public final Document getDocument(Object docKey) throws DBException {
- getDatabase().getSecurityManager().checkAccess(getCanonicalName() +
- "/", org.apache.xindice.core.security.Permission.READ);
-
+ public final Document getDocument(Object docKey) throws DBException {
checkFiler(FaultCodes.COL_NO_FILER);
Key key = createNewKey(docKey);
1.4 +1 -41 xml-xindice/java/src/org/apache/xindice/core/Database.java
Index: Database.java
===================================================================
RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/Database.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Database.java 6 May 2002 08:49:16 -0000 1.3
+++ Database.java 14 Jul 2002 09:35:53 -0000 1.4
@@ -60,7 +60,6 @@
*/
import org.apache.xindice.core.query.*;
-import org.apache.xindice.core.security.*;
import org.apache.xindice.core.objects.*;
import org.apache.xindice.core.request.*;
import org.apache.xindice.util.*;
@@ -89,7 +88,6 @@
private static final Map databases = new HashMap(); // String to Database
private DocumentCache docCache = new DocumentCache();
- private DBSecurityManager securityManager = null;
private ObjectPool uriPool = new ObjectPool() {
public Poolable createObject() {
@@ -127,19 +125,6 @@
dbroot);
setCollectionRoot(dbrootDir);
-
- // Create the security manager so that it exists for loading the system
- // collections.
- // TODO: Finish security manager implementation
- if (securityManager == null) {
- boolean disableSecurity = false;
- if (config.getAttribute(SECURITY).equals("false")) {
- disableSecurity = true;
- }
-
- securityManager = new LocalSecurityManager(this, disableSecurity);
- }
-
try {
Configuration queryCfg = config.getChild(QUERYENGINE);
if ( queryCfg != null )
@@ -162,22 +147,6 @@
collections.put(sysCol.getName(), sysCol);
sysInit = true;
}
-
- // System collections are loaded so we need to load the security config
- // and setup the system for secure operation.
- // TODO: Finish security manager implementation
- /*if (securityManager != null) {
- securityManager.readConfig();
- // Default admin level for the primary thread for testing.
- try {
- securityManager.authenticate("scott", "tiger");
- }
- catch (Exception e) {
- org.apache.xindice.Debug.printStackTrace(e);
- }
- securityManager.setActive();
- }*/
-
try {
// Bootstrap from the database itself... This is accomplished
@@ -273,15 +242,6 @@
*/
public QueryEngine getQueryEngine() {
return engine;
- }
-
- /**
- * Returns the security manager instance for this Database.
- *
- * @return The security manager
- */
- public DBSecurityManager getSecurityManager() {
- return securityManager;
}
}