eckehard 2005/01/14 00:10:31
Modified: proposals/tamino/src/store/org/apache/slide/store/tamino/store
Tag: TWS421_BRANCH XChildStore.java
Log:
Revision Changes Path
No revision
No revision
1.1.4.3 +11 -8
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XChildStore.java
Index: XChildStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XChildStore.java,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- XChildStore.java 14 May 2004 09:12:07 -0000 1.1.4.2
+++ XChildStore.java 14 Jan 2005 08:10:31 -0000 1.1.4.3
@@ -404,8 +404,9 @@
catch (Exception e) {
throw new ServiceInitializationFailedException(this, e);
}
- if ((taminoVersion >= (float)3.1) && (taminoVersion < (float)4.1) &&
enabled) {
- try {
+// if ((taminoVersion >= (float)3.1) && (taminoVersion < (float)4.1)
&& enabled) {
+ if (false) {
+ try {
new XSecurity(config, getParameter(TAMINO_BASE),
getParameter(TAMINO_DATABASE),
getParameter(TAMINO_COLLECTION));
@@ -415,7 +416,8 @@
}
// do 4.1 security only for DB >= 4.1
- } else if (taminoVersion >= (float)4.1) {
+ // } else if (taminoVersion >= (float)4.1) {
+ } else if (false) {
try {
// check if a forceSecureTamino has been set. additional
checks have to be done
if ("true".equalsIgnoreCase (secureTamino)) {
@@ -431,8 +433,9 @@
// A non-secure environment is available if Tamino
authentication
// parameter is on web server and the HTTP authentication
type is basic
String test =
XAuthenticator.getAuthenticationType(taminoBase, database,
config.getAdminDomain(), config.getAdminUser(), config.getAdminPwd());
- if (!((XAuthenticator.isWebseverEnabled(taminoBase,
database, config.getAdminDomain(), config.getAdminUser(), config.getAdminPwd()))
+ if (!((XAuthenticator.isWebseverEnabled(taminoBase, database,
config.getAdminDomain(), config.getAdminUser(), config.getAdminPwd()))
&&
(!((XAuthenticator.getAuthenticationType(taminoBase, database,
config.getAdminDomain(), config.getAdminUser(),
config.getAdminPwd())).equalsIgnoreCase("basic"))))) {
+
if ((user != null) && (passwd != null)) {
new XSecurityMultiUser(config,
getParameter(TAMINO_BASE),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
