You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2003/08/05 12:24:21 UTC

cvs commit: jakarta-slide/src/share/org/apache/slide/common NamespaceConfig.java

juergen     2003/08/05 03:24:21

  Modified:    src/share/org/apache/slide/common NamespaceConfig.java
  Log:
  the dummy init phase will use a dummy user, so no userpath and user_collection is required at this point in time.
  
  Revision  Changes    Path
  1.27      +12 -9     jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java
  
  Index: NamespaceConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- NamespaceConfig.java	16 Jul 2003 15:50:51 -0000	1.26
  +++ NamespaceConfig.java	5 Aug 2003 10:24:21 -0000	1.27
  @@ -847,11 +847,14 @@
               modifyRevisionContentAction = defaultAction;
               removeRevisionContentAction = defaultAction;
   
  -            // re-initialise users- and files-Path only, if not already set
  -            if (usersPath == null) usersPath = "";
  -            if (filesPath == null) filesPath = "";
  -//            usersPath = "";
  -//            filesPath = "";
  +            usersPath = "";
  +            filesPath = "";
  +
  +            // remove this parameter, as it is used in contructing the
  +            // principal url. In case of a dummy init this parameter should
  +            // be ignore, similar to the usersPath setting.
  +            parameters.remove("user_collection");
  +
   
           } catch (Exception e) {
               throw new InvalidNamespaceConfigurationException