[Unicore-cvs-commits] SF.net SVN: unicore:[16485] unity/trunk/distribution/src/main/bundle/conf

[<go...@us...>]

Revision: 16485
          http://sourceforge.net/p/unicore/svn/16485
Author:   golbi
Date:     2013-05-20 11:18:11 +0000 (Mon, 20 May 2013)
Log Message:
-----------
updated distro configs

Modified Paths:
--------------
    unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval.json
    unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval2.json
    unity/trunk/distribution/src/main/bundle/conf/unityServer.conf

Modified: unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval.json
===================================================================
--- unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval.json	2013-05-20 11:02:38 UTC (rev 16484)
+++ unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval.json	2013-05-20 11:18:11 UTC (rev 16485)
@@ -1,3 +1,3 @@
 {
-	"name": "Password"
+	"name": "Simple password"
 }	
\ No newline at end of file

Modified: unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval2.json
===================================================================
--- unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval2.json	2013-05-20 11:02:38 UTC (rev 16484)
+++ unity/trunk/distribution/src/main/bundle/conf/passwordRetrieval2.json	2013-05-20 11:18:11 UTC (rev 16485)
@@ -1,3 +1,3 @@
 {
-	"name": "Password 22"
+	"name": "Secured Password"
 }	
\ No newline at end of file

Modified: unity/trunk/distribution/src/main/bundle/conf/unityServer.conf
===================================================================
--- unity/trunk/distribution/src/main/bundle/conf/unityServer.conf	2013-05-20 11:02:38 UTC (rev 16484)
+++ unity/trunk/distribution/src/main/bundle/conf/unityServer.conf	2013-05-20 11:18:11 UTC (rev 16485)
@@ -44,19 +44,37 @@
 unityServer.core.credentials.2.credentialDescription=Dummy credential allowing for certificate login
 unityServer.core.credentials.2.credentialConfigurationFile=conf/empty.json
 
+
 #######################################
+# Credential requirement definitions
+#######################################
+
+unityServer.core.credentialRequirements.1.credentialReqName=secure password and certificate
+unityServer.core.credentialRequirements.1.credentialReqDescription=Secured password and certificate
+unityServer.core.credentialRequirements.1.credentialReqContents.1=secured password
+unityServer.core.credentialRequirements.1.credentialReqContents.2=certificate credential
+
+unityServer.core.credentialRequirements.2.credentialReqName=certificate
+unityServer.core.credentialRequirements.2.credentialReqDescription=Certificate only
+unityServer.core.credentialRequirements.2.credentialReqContents.1=certificate credential
+
+unityServer.core.credentialRequirements.3.credentialReqName=secure password
+unityServer.core.credentialRequirements.3.credentialReqDescription=Secured password only
+unityServer.core.credentialRequirements.3.credentialReqContents.1=secured password
+
+#######################################
 # Authenticators
 #######################################
 
-unityServer.core.authenticators.1.authenticatorName=pwdWeb1
+unityServer.core.authenticators.1.authenticatorName=pwdWeb
 unityServer.core.authenticators.1.authenticatorType=password with web-password
 unityServer.core.authenticators.1.localCredential=Password credential
 #unityServer.core.authenticators.1.verificatorConfigurationFile=conf/empty.json
 unityServer.core.authenticators.1.retrievalConfigurationFile=conf/passwordRetrieval.json
 
-unityServer.core.authenticators.2.authenticatorName=pwdWeb2
+unityServer.core.authenticators.2.authenticatorName=pwdWebSec
 unityServer.core.authenticators.2.authenticatorType=password with web-password
-unityServer.core.authenticators.2.localCredential=Password credential
+unityServer.core.authenticators.2.localCredential=secured password
 #unityServer.core.authenticators.2.verificatorConfigurationFile=conf/empty.json
 unityServer.core.authenticators.2.retrievalConfigurationFile=conf/passwordRetrieval2.json
 
@@ -74,10 +92,10 @@
 unityServer.core.endpoints.1.endpointConfigurationFile=conf/webadmin.json
 unityServer.core.endpoints.1.contextPath=/admin
 unityServer.core.endpoints.1.endpointName=UNITY administration interface
-unityServer.core.endpoints.1.endpointAuthenticators=pwdWeb1;pwdWeb2,pwdWeb1;certWeb;pwdWeb1,certWeb
+unityServer.core.endpoints.1.endpointAuthenticators=pwdWeb;pwdWebSec;certWeb;pwdWebSec,certWeb
 
 unityServer.core.endpoints.2.endpointType=SAMLWebIdP
 unityServer.core.endpoints.2.endpointConfigurationFile=conf/saml-webidp.properties
 unityServer.core.endpoints.2.contextPath=/saml-idp
 unityServer.core.endpoints.2.endpointName=UNITY SAML web authentication
-unityServer.core.endpoints.2.endpointAuthenticators=pwdWeb1;certWeb
+unityServer.core.endpoints.2.endpointAuthenticators=pwdWeb;certWeb

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.