diff --git a/archiva-docs/src/site/apt/adminguide/customising-security.apt b/archiva-docs/src/site/apt/adminguide/customising-security.apt index bd9a9e144..3ed7961b0 100644 --- a/archiva-docs/src/site/apt/adminguide/customising-security.apt +++ b/archiva-docs/src/site/apt/adminguide/customising-security.apt @@ -43,7 +43,7 @@ Archiva Security Configuration Following are some of the properties you can modify. For a complete list, consult the default properties file in Redback's svn repo: - {{{http://svn.codehaus.org/redback/redback/trunk/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties} + {{{http://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties} config-defaults.properties}} +-----+ diff --git a/archiva-docs/src/site/apt/adminguide/roles.apt b/archiva-docs/src/site/apt/adminguide/roles.apt index 4040aaf7c..dae3ca734 100644 --- a/archiva-docs/src/site/apt/adminguide/roles.apt +++ b/archiva-docs/src/site/apt/adminguide/roles.apt @@ -21,7 +21,7 @@ Understanding Apache Archiva Security Roles - Archiva uses the {{{http://redback.codehaus.org/} Redback}} security framework for managing repository security. When the server is first started, + Archiva uses the {{{http://archiva.apache.org/redback/} Redback}} security framework for managing repository security. When the server is first started, you will be prompted to create an administration user. This user will be given permission to administer all aspects of the system (as well as access to all of the repositories). This user can then be used to grant permissions to other users. diff --git a/archiva-docs/src/site/apt/adminguide/security.apt b/archiva-docs/src/site/apt/adminguide/security.apt index c34fb1431..d6a22d792 100644 --- a/archiva-docs/src/site/apt/adminguide/security.apt +++ b/archiva-docs/src/site/apt/adminguide/security.apt @@ -21,7 +21,7 @@ Understanding Apache Archiva Security - Archiva's security is managed by {{{http://redback.codehaus.org/} Redback}}. The following document describes how to configure your + Archiva's security is managed by {{{http://archiva.apache.org/redback/} Redback}}. The following document describes how to configure your repository security: * {{{./roles.html} Roles in Archiva}} diff --git a/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm b/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm index 17161dbdc..f75437eb8 100644 --- a/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm +++ b/archiva-docs/src/site/apt/adminguide/webservices/rest.apt.vm @@ -85,7 +85,7 @@ Using REST Services You can use Redback Rest Services to control user creation/modification and add/remove roles. - See {{http://redback.codehaus.org/integration/rest.html}} + See {{http://archiva.apache.org/redback/integration/rest.html}} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js index c41da3c53..9531b438c 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js @@ -510,8 +510,7 @@ define("redback.user",["jquery","order!utils","i18n","jquery.validate","order!kn * @param completeCallbackFn */ loginCall=function(username,password,successCallbackFn, errorCallbackFn, completeCallbackFn) { - var url = 'restServices/redbackServices/loginService/logIn';//?userName='+username; - //url += "&password="+password; + var url = 'restServices/redbackServices/loginService/logIn'; $.ajax({ url: url,