eckehard 2005/01/14 00:09:27
Modified:
proposals/tamino/src/store/org/apache/slide/store/tamino/datastore
Tag: TWS421_BRANCH XSecurityMultiUser.java
Log:
removed domain info form init data
Revision Changes Path
No revision
No revision
1.2.2.2 +16 -10
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XSecurityMultiUser.java
Index: XSecurityMultiUser.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XSecurityMultiUser.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XSecurityMultiUser.java 7 Jan 2005 14:49:14 -0000 1.2.2.1
+++ XSecurityMultiUser.java 14 Jan 2005 08:09:27 -0000 1.2.2.2
@@ -369,8 +369,10 @@
boolean result2 = insertSingleDocument (
defaultSchemaVersion +
"\n<ino:group
xmlns:ino=\"http://namespaces.softwareag.com/tamino/response2\";
ino:groupname=\""+WRITE_GROUP_NAME + collection +"\">\n"+
- "<ino:userref>"+ getDomain(domain) + user
+"</ino:userref>\n"+
- "<ino:userref>"+ getDomain(config.getAdminDomain()) +
config.getAdminUser() +"</ino:userref>\n"+
+// "<ino:userref>"+ getDomain(domain) + user
+"</ino:userref>\n"+
+// "<ino:userref>"+ getDomain(config.getAdminDomain()) +
config.getAdminUser() +"</ino:userref>\n"+
+ "<ino:userref>"+ user +"</ino:userref>\n"+
+ "<ino:userref>"+ config.getAdminUser() +"</ino:userref>\n"+
"<ino:aclref>"+ WRITE_ACL + collection +"</ino:aclref>\n"+
"</ino:group>");
@@ -426,9 +428,12 @@
//Create the Schema for the default user
return insertSingleDocument(
- "<ino:user ino:unencryptedpassword=\"" + password + "\"
xmlns:ino=\"http://namespaces.softwareag.com/tamino/response2\"; ino:userid=\""
+ getDomain(domain) + user + "\">\n" +
- user + ", Tamino WebDAV Server User" +
- "</ino:user>");
+// "<ino:user ino:unencryptedpassword=\"" + password + "\"
xmlns:ino=\"http://namespaces.softwareag.com/tamino/response2\"; ino:userid=\""
+ getDomain(domain) + user + "\">\n" +
+// user + ", Tamino WebDAV Server User" +
+// "</ino:user>");
+ "<ino:user ino:unencryptedpassword=\"" + password + "\"
xmlns:ino=\"http://namespaces.softwareag.com/tamino/response2\"; ino:userid=\""
+ user + "\">\n" +
+ user + ", Tamino WebDAV Server User" +
+ "</ino:user>");
}
@@ -486,7 +491,8 @@
* @throws TException
**/
public boolean defaultUserExist(String domain, String user) throws
TException{
- return getCountDocuments("ino:[EMAIL PROTECTED]:userid=\"" +
getDomain(domain) +user + "\"]" ) == 1 ;
+// return getCountDocuments("ino:[EMAIL PROTECTED]:userid=\"" +
getDomain(domain) +user + "\"]" ) == 1 ;
+ return getCountDocuments("ino:[EMAIL PROTECTED]:userid=\"" +user +
"\"]" ) == 1 ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
