NOJIRA added in missing xlogin login config options, cleanup login co…

…nfig

git-svn-id: https://source.sakaiproject.org/svn/config/trunk@310617 66ffb92e-73f9-0310-93c1-f5514f145a0a

config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

@@ -141,36 +141,35 @@
 # **NOTE: typically top.login and container.login should not be both set true or false
 # Include the user id and password for login on the gateway site
 # DEFAULT: true
-# top.login=true
+#top.login=true
 
 # Let the container handle login or not.
 # Set to true for single-sign on type setups, false for just internal login
 # DEFAULT: false
-# container.login=false
+#container.login=false
 
-# SAK-21498 prompt use to select an auth source when requesting authentication
-# Enable the auth choice page. Only set this if container.login=true
-# DEFAULT: false
-# login.auth.choice=true
+# Enabled extra login (use when enabling container login e.g. CAS) for direct guest login into Sakai
+# DEFAULT: false (disabled)
+#xlogin.enabled=true
 
-# SAK-21927 Create a link from the login tool to the password reset.
-# The URL where users should be directed to reset their password. This is presented to
-# users on the login tool when entering their username and password. If you leave
-# this unset and you have the password reset tool on your gateway site users
-# will be automatically directed to that tool.
-# DEFAULT: none (null)
-# login.password.reset.url=http://url/to/reset/password
+# Text to display for the extra login (no effect if xlogin is not enabled)
+# DEFAULT: Guest Login
+#xlogin.text=Guest Login
+
+# Use xlogin page to re-login (use when enabling container login e.g. CAS)
+# DEFAULT: true
+#login.use.xlogin.to.relogin=false
 
 # Set the icon or text you want for each option. Generally you wouldn't use both.
 # DEFAULTS: none
-# container.login.choice.icon=http://url/to/cas.jpg
-# container.login.choice.text=ANU Users
-# xlogin.choice.icon=ttp://url/to/sakai.jpg
-# xlogin.choice.text = Guest Users
+#container.login.choice.icon=http://url/to/cas.jpg
+#container.login.choice.text=ANU Users
+#xlogin.choice.icon=http://url/to/sakai.jpg
+#xlogin.choice.text = Guest Users
 
 # Should logins be allowed through HTTP basic authentication?
 # DEFAULT: false
-# allow.basic.auth.login=true
+#allow.basic.auth.login=true
 
 # If allow.basic.auth.login = true, then this feature is
 # enabled in BasicAuth, the determination of non browser clients is
@@ -183,45 +182,46 @@
 # 
 # e.g. if itunes was not listed as a client, either:
 # DEFAULT: none (null)
-# login.browser.user.agent.count=1
-# login.browser.user.agent.1=0itunes.*
+#login.browser.user.agent.count=1
+#login.browser.user.agent.1=0itunes.*
 
 # Log failed login attempts? 
 # DEFAULT: true
-# login.log-failed=false
-
-# Use xlogin page to re-login
-# DEFAULT: true
-# login.use.xlogin.to.relogin=false
+#login.log-failed=false
 
 # URL to image to use for logout image.
 # DEFAULT: none (null)
-# logout.icon=
+#logout.icon=
 
 # The message/text display for "logout" - note, if logout.icon is used, the message text is not displayed.
 # DEFAULT: sit_log property from the portal-impl/sitenav.properties
-# logout.text=
-
-# Create a new container authN filter which authenticates against K2
-# **NOTE:  Experimental Feature 2.8.0
-# login.k2.authentication.autoProvisionUser=true
-# top.login = false
-# container.login = true
-# login.k2.authentication = true
-# login.k2.authentication.vaildateUrl = http://localhost:8080/var/cluster/user.cookie.json?c=
+#logout.text=
 
 # Set the URL for container logout.
 # If you want a different URL when container authenticated users are logged out use this.
 # DEFAULT: none (null)
-# login.container.logout.url=https://sso.instition.edu/logout
+#login.container.logout.url=https://sso.instition.edu/logout
+
+# SAK-21498 prompt use to select an auth source when requesting authentication
+# Enable the auth choice page. Only set this if container.login=true
+# DEFAULT: false
+#login.auth.choice=true
+
+# SAK-21927 Create a link from the login tool to the password reset.
+# The URL where users should be directed to reset their password. This is presented to
+# users on the login tool when entering their username and password. If you leave
+# this unset and you have the password reset tool on your gateway site users
+# will be automatically directed to that tool.
+# DEFAULT: none (null)
+#login.password.reset.url=http://url/to/reset/password
 
 # SAK-16499
 # Url to redirect the user to when they have been disabled 
 # If you do not specify a disabledSiteUrl then the system 
 # will use /portal/disabled by default. 
 # You can go and create a public /portal/disabled site/page 
 # for this purpose. 
-# disabledSiteUrl=https://this.user.is.disabled/disabled 
+#disabledSiteUrl=https://this.user.is.disabled/disabled
 
 
 # ########################################################################